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

ob_dj_store/core/stores/migrations/0106_alter_paymentmethod_payment_provider.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.8 on 2024-12-22 19:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0105_store_is_open_after_midnight"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="paymentmethod",
+            name="payment_provider",
+            field=models.CharField(
+                choices=[
+                    ("cod", "cash on delivery"),
+                    ("src_all", "TAP all payment methods"),
+                    ("src_card", "Tap Credit Card"),
+                    ("src_kw.knet", "Tap knet"),
+                    ("paypal", "Paypal"),
+                    ("stripe", "Stripe"),
+                    ("wallet", "Wallet"),
+                    ("gift", "Gift"),
+                    ("src_apple_pay", "Apple Pay"),
+                    ("google_pay", "Google Pay"),
+                    ("src_sa.mada", "Mada"),
+                    ("src_bh.benefit", "Benefit"),
+                ],
+                default="cod",
+                max_length=20,
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0107_auto_20250425_2059.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.8 on 2025-04-25 17:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0106_alter_paymentmethod_payment_provider"),
+    ]
+
+    operations = [
+        migrations.RemoveField(model_name="store", name="is_open_after_midnight",),
+        migrations.AddField(
+            model_name="openinghours",
+            name="is_open_after_midnight",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="offer_id",
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="offer_redeemed",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0108_alter_paymentmethod_payment_provider.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.8 on 2025-04-29 20:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0107_auto_20250425_2059"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="paymentmethod",
+            name="payment_provider",
+            field=models.CharField(
+                choices=[
+                    ("cod", "cash on delivery"),
+                    ("src_all", "TAP all payment methods"),
+                    ("src_card", "Tap Credit Card"),
+                    ("src_kw.knet", "Tap knet"),
+                    ("paypal", "Paypal"),
+                    ("stripe", "Stripe"),
+                    ("wallet", "Wallet"),
+                    ("gift", "Gift"),
+                    ("apple_pay", "Apple Pay"),
+                    ("google_pay", "Google Pay"),
+                    ("src_sa.mada", "Mada"),
+                    ("src_bh.benefit", "Benefit"),
+                ],
+                default="cod",
+                max_length=20,
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0109_wallettransaction_cashback_type.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.8 on 2025-07-31 16:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0108_alter_paymentmethod_payment_provider"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="wallettransaction",
+            name="cashback_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("BY_ORDER", "By Order"),
+                    ("BY_OFFER", "By Offer"),
+                    ("BY_STREAK", "By Streak"),
+                ],
+                max_length=100,
+                null=True,
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0110_auto_20250923_1714.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.8 on 2025-09-23 14:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0109_wallettransaction_cashback_type"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="productvariant",
+            options={
+                "ordering": ("order_value",),
+                "verbose_name": "Product Variation",
+                "verbose_name_plural": "Product Variations",
+            },
+        ),
+        migrations.AddField(
+            model_name="productvariant",
+            name="order_value",
+            field=models.PositiveSmallIntegerField(default=1, verbose_name="ordering"),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0111_auto_20251023_1700.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.8 on 2025-10-23 14:00
+
+import timezone_field.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0110_auto_20250923_1714"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="store",
+            name="has_daylight_saving_time",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="store",
+            name="timezone",
+            field=timezone_field.fields.TimeZoneField(default="Asia/Kuwait"),
+        ),
+        migrations.AlterField(
+            model_name="tax",
+            name="value",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=5,
+                help_text="Value for the given Payment -> 0.0625",
+                max_digits=7,
+                null=True,
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0112_auto_20251027_1739.py

@@ -0,0 +1,98 @@
+# Generated by Django 3.2.8 on 2025-10-27 14:39
+
+import django.db.models.deletion
+import django_countries.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0111_auto_20251023_1700"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Tip",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=150)),
+                ("description", models.TextField(blank=True, null=True)),
+                ("is_applied", models.BooleanField(default=True)),
+                (
+                    "country",
+                    django_countries.fields.CountryField(
+                        blank=True, default="KW", max_length=2, null=True
+                    ),
+                ),
+                ("is_active", models.BooleanField(default=False)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+            ],
+            options={"verbose_name": "Tip", "verbose_name_plural": "Tips",},
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="tip_percentage",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                help_text="Percentage value of the tip (e.g., 10 for 10%)",
+                max_digits=5,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="tip_value",
+            field=models.DecimalField(
+                blank=True, decimal_places=2, max_digits=5, null=True
+            ),
+        ),
+        migrations.CreateModel(
+            name="TipAmount",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "percentage",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=2,
+                        help_text="Percentage value of the tip (e.g., 10 for 10%)",
+                        max_digits=5,
+                        null=True,
+                    ),
+                ),
+                (
+                    "tip",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="tip_amounts",
+                        to="stores.tip",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Tip Amount",
+                "verbose_name_plural": "Tip Amounts",
+            },
+        ),
+    ]

ob_dj_store/core/stores/migrations/0113_order_tax_value.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.8 on 2025-11-25 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0112_auto_20251027_1739"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="order",
+            name="tax_value",
+            field=models.DecimalField(
+                blank=True, decimal_places=2, max_digits=5, null=True
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0114_store_mask_customer_info.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2025-12-09 20:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0113_order_tax_value"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="store",
+            name="mask_customer_info",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ob_dj_store/core/stores/models/__init__.py

@@ -7,7 +7,13 @@ from ob_dj_store.core.stores.models._feedback import (
     FeedbackConfig,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory, InventoryOperations
-from ob_dj_store.core.stores.models._order import Order, OrderHistory, OrderItem
+from ob_dj_store.core.stores.models._order import (
+    Order,
+    OrderHistory,
+    OrderItem,
+    Tip,
+    TipAmount,
+)
 from ob_dj_store.core.stores.models._partner import (
     Discount,
     Partner,
@@ -85,4 +91,6 @@ __all__ = [
     "PartnerOTPAuth",
     "Discount",
     "CountryPaymentMethod",
+    "Tip",
+    "TipAmount",
 ]

ob_dj_store/core/stores/models/_address.py

@@ -10,9 +10,7 @@ class BaseAddress(models.Model):
     Base class for all address models.
     """
 
-    address_line = models.CharField(
-        max_length=250,
-    )
+    address_line = models.CharField(max_length=250,)
     address_line_arabic = models.CharField(max_length=250, blank=True, null=True)
     postal_code = models.CharField(
         max_length=64, help_text=_("The address postal/zip code.")

ob_dj_store/core/stores/models/_cart.py

@@ -1,3 +1,4 @@
+import logging
 from decimal import Decimal
 
 from django.contrib.auth import get_user_model
@@ -10,6 +11,8 @@ from ob_dj_store.core.stores.managers import CartItemManager, CartManager
 from ob_dj_store.core.stores.models._partner import PartnerAuthInfo
 from ob_dj_store.core.stores.utils import round_up_tie
 
+logger = logging.getLogger(__name__)
+
 
 class Cart(models.Model):
     customer = models.OneToOneField(
@@ -48,7 +51,11 @@ class Cart(models.Model):
     def total_price(self) -> Decimal:
         total_price = Decimal(0)
         for item in self.items.all():
-            total_price += item.total_price
+            try:
+                if item.inventory.quantity and item.inventory.quantity > 0:
+                    total_price += item.total_price
+            except AttributeError:
+                logger.error(f"Item {item} has no inventory")
         return total_price
 
     @property
@@ -56,9 +63,7 @@ class Cart(models.Model):
         return self.total_price + self.get_applied_tax_amount()
 
     @property
-    def full_price(
-        self,
-    ) -> Decimal:
+    def full_price(self,) -> Decimal:
         return self.total_price_with_tax - self.discount_offer_amount
 
     @property
@@ -90,7 +95,8 @@ class Cart(models.Model):
     def fill(self, order):
         from ob_dj_store.core.stores.models._cart import CartItem
 
-        for item in order.items.all():
+        order_items = order.items.all()
+        for item in order_items:
             cart_item = CartItem.objects.create(
                 cart=self,
                 product_variant=item.product_variant,

ob_dj_store/core/stores/models/_feedback.py

@@ -22,9 +22,7 @@ class Feedback(models.Model):
         get_user_model(), related_name="feedbacks", on_delete=models.CASCADE
     )
     order = models.ForeignKey(
-        "stores.Order",
-        related_name="feedbacks",
-        on_delete=models.CASCADE,
+        "stores.Order", related_name="feedbacks", on_delete=models.CASCADE,
     )
     review = models.CharField(
         max_length=100, choices=Reviews.choices, default="NOT_AVAILABLE"

ob_dj_store/core/stores/models/_inventory.py

@@ -37,8 +37,7 @@ class Inventory(DjangoModelCleanMixin, models.Model):
     # Add is_primary for variant
     is_primary = models.BooleanField(default=True)
     preparation_time = models.DurationField(
-        default=timedelta(minutes=0),
-        help_text=_("Preparation time in minutes"),
+        default=timedelta(minutes=0), help_text=_("Preparation time in minutes"),
     )
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -61,6 +60,8 @@ class Inventory(DjangoModelCleanMixin, models.Model):
 
     @property
     def is_snoozed(self):
+        if not self.is_active:
+            return True
         return self.snooze_start_date <= now() <= self.snooze_end_date
 
     @property

ob_dj_store/core/stores/models/_order.py

@@ -1,12 +1,13 @@
-from decimal import Decimal
+from decimal import ROUND_HALF_UP, Decimal
 
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from django_countries.fields import CountryField
 
-from ob_dj_store.core.stores.managers import OrderItemManager, OrderManager
+from ob_dj_store.core.stores.managers import OrderItemManager, OrderManager, TipManager
 from ob_dj_store.utils.model import DjangoModelCleanMixin
 
 
@@ -41,10 +42,7 @@ class Order(DjangoModelCleanMixin, models.Model):
         "stores.Discount", on_delete=models.PROTECT, null=True, blank=True
     )
     customer = models.ForeignKey(
-        get_user_model(),
-        related_name="orders",
-        on_delete=models.SET_NULL,
-        null=True,
+        get_user_model(), related_name="orders", on_delete=models.SET_NULL, null=True,
     )
     store = models.ForeignKey(
         "stores.Store",
@@ -82,9 +80,7 @@ class Order(DjangoModelCleanMixin, models.Model):
         blank=True,
     )
     status = models.CharField(
-        max_length=32,
-        default=OrderStatus.PENDING,
-        choices=OrderStatus.choices,
+        max_length=32, default=OrderStatus.PENDING, choices=OrderStatus.choices,
     )
     # Add pickup time for an order, Pick up can be now or a later hour during the day
     pickup_time = models.DateTimeField(
@@ -93,12 +89,23 @@ class Order(DjangoModelCleanMixin, models.Model):
     # Order id of the pickup_car
     car_id = models.PositiveIntegerField(null=True, blank=True)
     # Pick up can be now or a later hour during the day. If pickup_time is not set,
-    extra_infos = models.JSONField(
+    extra_infos = models.JSONField(null=True, blank=True,)
+    init_data = models.JSONField(null=True, blank=True)
+    offer_redeemed = models.BooleanField(default=False)
+    offer_id = models.IntegerField(null=True, blank=True, default=None)
+    tip_percentage = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
         null=True,
         blank=True,
+        help_text=_("Percentage value of the tip (e.g., 10 for 10%)"),
+    )
+    tip_value = models.DecimalField(
+        max_digits=5, decimal_places=2, null=True, blank=True,
+    )
+    tax_value = models.DecimalField(
+        max_digits=5, decimal_places=2, null=True, blank=True,
     )
-    init_data = models.JSONField(null=True, blank=True)
-
     # TODO: add pick_up_time maybe ?
     # audit fields
     created_at = models.DateTimeField(auto_now_add=True)
@@ -163,6 +170,17 @@ class Order(DjangoModelCleanMixin, models.Model):
                 return self.OrderType.WALLET.value
         return self.OrderType.PHYSICAL.value
 
+    def calculate_tip(self):
+        """
+        Returns the tip amount based on a total order amount.
+        """
+        if not self.tip_percentage:
+            return Decimal("0.00")
+        tip_value = (self.total_amount * self.tip_percentage / Decimal("100")).quantize(
+            Decimal("0.01"), rounding=ROUND_HALF_UP
+        )
+        return tip_value
+
     def save(self, **kwargs):
         if not self.pk and self.shipping_address:
             self.immutable_shipping_address = self.shipping_address.to_immutable()
@@ -195,10 +213,7 @@ class OrderItem(DjangoModelCleanMixin, models.Model):
     total_price = models.DecimalField(max_digits=10, decimal_places=3, default=0)
     quantity = models.PositiveIntegerField(
         validators=[
-            MinValueValidator(
-                1,
-                message="Can you please provide a valid quantity !",
-            )
+            MinValueValidator(1, message="Can you please provide a valid quantity !",)
         ],
         help_text=_("quantity of the variant"),
     )
@@ -277,10 +292,7 @@ class OrderHistory(DjangoModelCleanMixin, models.Model):
     """
 
     order = models.ForeignKey(Order, related_name="history", on_delete=models.CASCADE)
-    status = models.CharField(
-        max_length=32,
-        choices=Order.OrderStatus.choices,
-    )
+    status = models.CharField(max_length=32, choices=Order.OrderStatus.choices,)
     created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
@@ -290,3 +302,40 @@ class OrderHistory(DjangoModelCleanMixin, models.Model):
 
     def __str__(self):
         return f"OrderHistory - {self.status}"
+
+
+class TipAmount(models.Model):
+    percentage = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("Percentage value of the tip (e.g., 10 for 10%)"),
+    )
+    tip = models.ForeignKey(
+        "Tip",
+        related_name="tip_amounts",
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+    )
+
+    class Meta:
+        verbose_name = _("Tip Amount")
+        verbose_name_plural = _("Tip Amounts")
+
+
+class Tip(models.Model):
+    name = models.CharField(max_length=150)
+    description = models.TextField(null=True, blank=True)
+    is_applied = models.BooleanField(default=True)
+    country = CountryField(blank=True, null=True, default="KW")
+    is_active = models.BooleanField(default=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    objects = TipManager()
+
+    class Meta:
+        verbose_name = _("Tip")
+        verbose_name_plural = _("Tips")

ob_dj_store/core/stores/models/_payment.py

@@ -10,6 +10,7 @@ from django_countries.fields import CountryField
 from config import settings as store_settings
 from ob_dj_store.core.stores.managers import PaymentManager
 from ob_dj_store.core.stores.models import Order
+from ob_dj_store.core.stores.utils import round_up_tie
 
 logger = logging.getLogger(__name__)
 
@@ -35,8 +36,8 @@ class Tax(models.Model):
     country = CountryField(help_text=_("The address country."), default="KW")
     value = models.DecimalField(
         blank=True,
-        max_digits=5,
-        decimal_places=3,
+        max_digits=7,
+        decimal_places=5,
         null=True,
         help_text="Value for the given Payment -> 0.0625",
     )
@@ -75,21 +76,12 @@ class Payment(models.Model):
         related_name="user_payments",
     )
     status = models.CharField(
-        max_length=100,
-        default=PaymentStatus.INIT,
-        choices=PaymentStatus.choices,
+        max_length=100, default=PaymentStatus.INIT, choices=PaymentStatus.choices,
     )
     method = models.ForeignKey(
-        "stores.PaymentMethod",
-        on_delete=models.CASCADE,
-        null=True,
-        blank=True,
-    )
-    payment_tax = models.ForeignKey(
-        Tax,
-        on_delete=models.SET_NULL,
-        null=True,
+        "stores.PaymentMethod", on_delete=models.CASCADE, null=True, blank=True,
     )
+    payment_tax = models.ForeignKey(Tax, on_delete=models.SET_NULL, null=True,)
     orders = models.ManyToManyField("stores.Order", related_name="payments")
     amount = models.DecimalField(
         max_digits=settings.DEFAULT_MAX_DIGITS,
@@ -155,18 +147,26 @@ 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, orders))
+        sum_orders = sum(
+            (Decimal(order.total_amount) if order.total_amount else Decimal("0"))
+            for order in orders
         )
-        if not self.payment_tax:
-            return sum_orders
-        elif not self.payment_tax.is_applied:
-            return sum_orders
-        elif self.payment_tax.rate == Tax.Rates.PERCENTAGE:
-            perc = Decimal(sum_orders * self.payment_tax.value / 100)
-            return round(sum_orders + perc, 3)
+        sum_orders = Decimal(sum_orders)
+
+        # Apply tax if applicable
+        tax = self.payment_tax
+        if tax and tax.is_applied:
+            if tax.rate == Tax.Rates.PERCENTAGE:
+                sum_orders += round_up_tie(sum_orders * Decimal(tax.value) / 100, 3)
+            else:
+                sum_orders += round_up_tie(self.payment_tax.value, 3)
+
+        # Add tip if present
+        first_order = orders.first()
+        if first_order and first_order.tip_value:
+            sum_orders += Decimal(first_order.tip_value)
 
-        return round(sum_orders + self.payment_tax.value, 3)
+        return round_up_tie(sum_orders, 3)
 
     @property
     def type_of_order(self):
@@ -189,4 +189,8 @@ class Payment(models.Model):
             settings.BENEFIT,
         ]:
             payment_url = self.tap_payment.payment_url
+        elif gateway == settings.STRIPE:
+            # For Stripe, return the client_secret which is used by Stripe.js
+            if hasattr(self, "stripe_payment"):
+                payment_url = self.stripe_payment.payment_url
         return payment_url