ob-dj-store 0.0.19__py3-none-any.whl → 0.0.23.2__py3-none-any.whl

ob_dj_store/core/stores/models/_product.py

@@ -141,7 +141,7 @@ class AvailabilityHours(DjangoModelCleanMixin, models.Model):
     def clean(self) -> None:
         super().clean()
         try:
-            if self.store.is_open_after_midnight:
+            if self.store.current_opening_hours.is_open_after_midnight:
                 return
         except Exception as e:
             logger.info(f"OpeningHours has no store: {e}")
@@ -204,10 +204,7 @@ class Product(DjangoModelCleanMixin, models.Model):
 
     name = models.CharField(max_length=200, help_text=_("Name"), unique=True)
     name_arabic = models.CharField(
-        max_length=200,
-        null=True,
-        blank=True,
-        help_text=_("Name in arabic"),
+        max_length=200, null=True, blank=True, help_text=_("Name in arabic"),
     )
     slug = models.SlugField(max_length=255, unique=True)
     label = models.CharField(
@@ -219,18 +216,11 @@ class Product(DjangoModelCleanMixin, models.Model):
     description = models.TextField(null=True, blank=True)
     description_arabic = models.TextField(null=True, blank=True)
     # TODO: A product can be assigned to multiple categories
-    category = models.ManyToManyField(
-        Category,
-        related_name="products",
-        blank=True,
-    )
+    category = models.ManyToManyField(Category, related_name="products", blank=True,)
     is_active = models.BooleanField(default=False)
     is_featured = models.BooleanField(default=False)
     tags = models.ManyToManyField(ProductTag, related_name="products", blank=True)
-    type = models.CharField(
-        max_length=32,
-        choices=ProductTypes.choices,
-    )
+    type = models.CharField(max_length=32, choices=ProductTypes.choices,)
     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)
     order_value = models.PositiveSmallIntegerField(
@@ -258,6 +248,28 @@ class Product(DjangoModelCleanMixin, models.Model):
     def __str__(self):
         return f"Product {self.name} (PK={self.pk})"
 
+    def get_inventory(self, store_id):
+        try:
+            # Prefer the primary variant if available
+            product_variant = (
+                self.product_variants.filter(inventories__is_primary=True).first()
+                or self.product_variants.first()
+            )
+            if not product_variant:
+                return None
+            return product_variant.inventories.get(store_id=store_id)
+        except ObjectDoesNotExist:
+            return None
+
+    def is_snoozed(self, store_id):
+        try:
+            inventory = self.product_variants.first().inventories.get(store=store_id)
+        except ObjectDoesNotExist:
+            return False
+        if not self.is_active:
+            return True
+        return inventory.is_snoozed
+
 
 # TODO: must remove, redundunt
 class Attribute(DjangoModelCleanMixin, models.Model):
@@ -377,9 +389,7 @@ class ProductAttribute(DjangoModelCleanMixin, models.Model):
         AttributeChoice, related_name="product_attributes", blank=True
     )
     type = models.CharField(
-        max_length=32,
-        default=Type.ONE_CHOICE,
-        choices=Type.choices,
+        max_length=32, default=Type.ONE_CHOICE, choices=Type.choices,
     )
     order_value = models.PositiveSmallIntegerField(
         verbose_name=_("ordering"), default=1
@@ -439,6 +449,9 @@ class ProductVariant(DjangoModelCleanMixin, models.Model):
     image_thumbnail_medium = models.ImageField(
         upload_to="product_variant_media/", null=True, blank=True
     )
+    order_value = models.PositiveSmallIntegerField(
+        verbose_name=_("ordering"), default=1
+    )
     # Audit fields
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -448,6 +461,7 @@ class ProductVariant(DjangoModelCleanMixin, models.Model):
     class Meta:
         verbose_name = _("Product Variation")
         verbose_name_plural = _("Product Variations")
+        ordering = ("order_value",)
 
     def __str__(self):
         return f"Variation {self.product.name} {self.name} (PK={self.pk})"

ob_dj_store/core/stores/models/_store.py

@@ -8,6 +8,7 @@ from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
 from phonenumber_field.modelfields import PhoneNumberField
+from timezone_field import TimeZoneField
 
 from ob_dj_store.core.stores.managers import (
     CountryPaymentMethodManager,
@@ -85,9 +86,7 @@ class PaymentMethod(models.Model):
     """
 
     payment_provider = models.CharField(
-        max_length=20,
-        choices=settings.PAYMENT_PROVIDER_CHOICES,
-        default="cod",
+        max_length=20, choices=settings.PAYMENT_PROVIDER_CHOICES, default="cod",
     )
     is_active = models.BooleanField(default=True)
     name = models.CharField(max_length=200, help_text=_("Name"))
@@ -149,9 +148,7 @@ class Store(DjangoModelCleanMixin, models.Model):
         help_text=_("Shipping methods within the store"),
     )
     pickup_addresses = models.ManyToManyField(
-        "stores.address",
-        related_name="pickup_stores",
-        blank=True,
+        "stores.address", related_name="pickup_stores", blank=True,
     )
     payment_methods = models.ManyToManyField(
         PaymentMethod,
@@ -179,15 +176,13 @@ class Store(DjangoModelCleanMixin, models.Model):
     )
     image = models.ImageField(upload_to=store_media_upload_to, null=True, blank=True)
     currency = models.CharField(
-        max_length=3,
-        default="KWD",
-        validators=[
-            validate_currency,
-        ],
+        max_length=3, default="KWD", validators=[validate_currency,],
     )
     busy_mode = models.BooleanField(default=False)
     is_digital = models.BooleanField(default=False)
-    is_open_after_midnight = models.BooleanField(default=False)
+    timezone = TimeZoneField(default="Asia/Kuwait")
+    has_daylight_saving_time = models.BooleanField(default=False)
+    mask_customer_info = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -246,6 +241,7 @@ class OpeningHours(DjangoModelCleanMixin, models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     always_open = models.BooleanField(default=False)
+    is_open_after_midnight = models.BooleanField(default=False)
 
     class Meta:
         ordering = ("weekday", "from_hour")
@@ -260,7 +256,7 @@ class OpeningHours(DjangoModelCleanMixin, models.Model):
     def clean(self) -> None:
         super().clean()
         try:
-            if self.store.is_open_after_midnight:
+            if self.store:
                 return
         except Exception as e:
             logger.info(f"OpeningHours has no store: {e}")

ob_dj_store/core/stores/models/_wallet.py

@@ -47,9 +47,7 @@ class WalletMedia(DjangoModelCleanMixin, models.Model):
 
 class Wallet(models.Model):
     user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="wallets",
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="wallets",
     )
     name = models.CharField(max_length=200, null=True, blank=True)
     name_arabic = models.CharField(max_length=200, null=True, blank=True)
@@ -61,11 +59,7 @@ class Wallet(models.Model):
         related_name="wallets",
     )
     currency = models.CharField(
-        max_length=3,
-        default="KWD",
-        validators=[
-            validate_currency,
-        ],
+        max_length=3, default="KWD", validators=[validate_currency,],
     )
     is_active = models.BooleanField(default=True)
 
@@ -82,8 +76,7 @@ class Wallet(models.Model):
         query = self.transactions.aggregate(
             balance=Coalesce(
                 models.Sum(
-                    "amount",
-                    filter=models.Q(type=WalletTransaction.TYPE.CREDIT),
+                    "amount", filter=models.Q(type=WalletTransaction.TYPE.CREDIT),
                 ),
                 models.Value(Decimal(0)),
                 output_field=models.DecimalField(),
@@ -118,21 +111,34 @@ class Wallet(models.Model):
         )
         user = self.user
         order = Order.objects.create(
-            customer=user,
-            payment_method=payment_method,
-            extra_infos=extra_infos,
+            customer=user, payment_method=payment_method, extra_infos=extra_infos,
         )
         payment = Payment.objects.create(
-            orders=[
-                order,
-            ],
+            orders=[order,],
             user=user,
             currency=self.currency,
             method=payment_method,
             amount=amount,
         )
-        tap_payment = payment.tap_payment
-        return (tap_payment.payment_url, tap_payment.charge_id)
+
+        provider = payment_method.payment_provider
+        logger.info(f"Payment ID: {payment.id}")
+        logger.info(f"Payment provider: {provider}")
+        try:
+            if provider == settings.STRIPE:
+                logger.info(
+                    f"Stripe payment info: {payment.stripe_payment.payment_intent_id}"
+                )
+                return (
+                    payment.stripe_payment.payment_url,
+                    payment.stripe_payment.payment_intent_id,
+                )
+            else:
+                logger.info(f"TAP payment info: {payment.tap_payment.charge_id}")
+                return (payment.tap_payment.payment_url, payment.tap_payment.charge_id)
+        except Exception as e:
+            logger.warning(f"Error returning payment details")
+            return (None, None)
 
 
 class WalletTransaction(models.Model):
@@ -147,15 +153,15 @@ class WalletTransaction(models.Model):
         CREDIT = "CREDIT", _("credit")
         DEBIT = "DEBIT", _("debit")
 
+    class CashBackType(models.TextChoices):
+        BY_ORDER = "BY_ORDER", _("By Order")
+        BY_OFFER = "BY_OFFER", _("By Offer")
+        BY_STREAK = "BY_STREAK", _("By Streak")
+
     wallet = models.ForeignKey(
-        "stores.Wallet",
-        on_delete=models.CASCADE,
-        related_name="transactions",
-    )
-    type = models.CharField(
-        max_length=100,
-        choices=TYPE.choices,
+        "stores.Wallet", on_delete=models.CASCADE, related_name="transactions",
     )
+    type = models.CharField(max_length=100, choices=TYPE.choices,)
 
     amount = models.DecimalField(
         max_digits=settings.DEFAULT_MAX_DIGITS,
@@ -166,7 +172,9 @@ class WalletTransaction(models.Model):
     is_cashback = models.BooleanField(default=False)
     is_refund = models.BooleanField(default=False)
     is_redeemed = models.BooleanField(default=False)
-
+    cashback_type = models.CharField(
+        max_length=100, choices=CashBackType.choices, blank=True, null=True
+    )
     objects = WalletTransactionManager()
 
     # Audit

ob_dj_store/core/stores/receivers.py

@@ -1,3 +1,5 @@
+import logging
+
 from django.conf import settings
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
@@ -12,8 +14,11 @@ from ob_dj_store.core.stores.models import (
     ProductVariant,
     WalletMedia,
 )
+from ob_dj_store.core.stores.utils import get_currency_by_country
 from ob_dj_store.utils.utils import resize_image
 
+logger = logging.getLogger(__name__)
+
 
 @receiver(
     post_save,
@@ -21,37 +26,56 @@ from ob_dj_store.utils.utils import resize_image
     dispatch_uid="create_customer_cart_and_wallet_handler",
 )
 def create_customer_cart_and_wallet_handler(sender, instance, created, **kwargs):
-    if not created:
-        return
-    cart = Cart(customer=instance)
-    cart.save()
-    wallet_media = WalletMedia.objects.filter(is_default=True)
-    for currency in store_settings.WALLET_CURRENCIES:
-        instance.wallets.create(currency=currency, media_image=wallet_media.first())
+    try:
+        logger.info(f"Creating cart and wallet for user {instance.id}")
+        if not hasattr(instance, "cart"):
+            cart = Cart(customer=instance)
+            cart.save()
+
+        wallet_media = WalletMedia.objects.filter(is_default=True)
+        wallet_currencies = settings.WALLET_CURRENCIES
+        logger.info(f"Wallet currencies: {wallet_currencies}")
+        # getattr(instance, "country", "") : only for bypassing ob_dj_store users
+        if getattr(instance, "country", "") and instance.country:
+            currency = get_currency_by_country(instance.country.code)
+            if currency not in wallet_currencies:
+                wallet_currencies = settings.US_WALLET_CURRENCIES
+        logger.info(f"Wallet currencies: {wallet_currencies}")
+
+        # check if wallet exists since we now run the signal on every user update
+        for currency in wallet_currencies:
+            instance.wallets.get_or_create(
+                currency=currency, media_image=wallet_media.first()
+            )
+
+        # delete gcc wallets if exists for US based users
+        if getattr(instance, "country", "") and instance.country:
+            currency = get_currency_by_country(instance.country.code)
+            if currency in settings.US_WALLET_CURRENCIES:
+                instance.wallets.filter(
+                    currency__in=settings.WALLET_CURRENCIES
+                ).delete()
+    except Exception:
+        logger.error(f"Error creating cart for user {instance.id}")
 
 
 # add receiver to ProductVariant to create inventory
 
 
 @receiver(
-    post_save,
-    sender=Order,
-    dispatch_uid="create_order_history_handler",
+    post_save, sender=Order, dispatch_uid="create_order_history_handler",
 )
 def create_order_history_handler(sender, instance, created, **kwargs):
     try:
         OrderHistory.objects.create(
-            order=instance,
-            status=instance.status,
+            order=instance, status=instance.status,
         )
     except Exception:
         pass
 
 
 @receiver(
-    pre_save,
-    sender=Category,
-    dispatch_uid="create_category_thumbnails",
+    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)
@@ -74,9 +98,7 @@ def create_category_thumbnails(sender, instance, **kwargs):
 
 
 @receiver(
-    pre_save,
-    sender=ProductMedia,
-    dispatch_uid="create_product_media_thumbnails",
+    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)
@@ -99,17 +121,13 @@ def create_product_media_thumbnails(sender, instance, **kwargs):
 
 
 @receiver(
-    pre_save,
-    sender=WalletMedia,
-    dispatch_uid="create_wallet_thumbnails",
+    pre_save, sender=WalletMedia, 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",
+            instance.image, dim=medium_dim, size_name="medium",
         )
 
 
@@ -122,7 +140,5 @@ def create_product_vraiant_image_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",
+            instance.image, dim=medium_dim, size_name="medium",
         )

ob_dj_store/core/stores/utils.py

@@ -76,8 +76,7 @@ def get_country_by_currency(currency):
 def validate_currency(value):
     if not pycountry.currencies.get(alpha_3=value):
         raise ValidationError(
-            _("%(value)s is not a currency"),
-            params={"value": value},
+            _("%(value)s is not a currency"), params={"value": value},
         )
 
 

{ob_dj_store-0.0.19.dist-info → ob_dj_store-0.0.23.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.19
+Version: 0.0.23.2
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes
@@ -25,6 +25,7 @@ Requires-Dist: djangorestframework-gis
 Requires-Dist: django-filter
 Requires-Dist: django-leaflet
 Requires-Dist: django-countries
+Dynamic: requires-dist
 
 ## OBytes Django Store App