ob-dj-store 0.0.20.2__py3-none-any.whl → 0.0.20.4__py3-none-any.whl

ob_dj_store/core/stores/migrations/0082_auto_20230613_1424.py

@@ -10,10 +10,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="store",
-            name="always_open",
-        ),
+        migrations.RemoveField(model_name="store", name="always_open",),
         migrations.AddField(
             model_name="openinghours",
             name="always_open",

ob_dj_store/core/stores/migrations/0084_payment_result.py

@@ -11,8 +11,6 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AddField(
-            model_name="payment",
-            name="result",
-            field=models.TextField(null=True),
+            model_name="payment", name="result", field=models.TextField(null=True),
         ),
     ]

ob_dj_store/core/stores/migrations/0087_auto_20230828_2138.py

@@ -13,10 +13,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="product",
-            name="category",
-        ),
+        migrations.RemoveField(model_name="product", name="category",),
         migrations.AddField(
             model_name="product",
             name="category",

ob_dj_store/core/stores/migrations/0097_auto_20231108_1939.py

@@ -26,10 +26,7 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Store Attribute Choices",
             },
         ),
-        migrations.RemoveField(
-            model_name="attributechoice",
-            name="price",
-        ),
+        migrations.RemoveField(model_name="attributechoice", name="price",),
         migrations.AddField(
             model_name="storeattributechoice",
             name="price",

ob_dj_store/core/stores/migrations/0100_remove_shippingmethod_type_arabic.py

@@ -10,8 +10,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="shippingmethod",
-            name="type_arabic",
-        ),
+        migrations.RemoveField(model_name="shippingmethod", name="type_arabic",),
     ]

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/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

@@ -63,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

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)

ob_dj_store/core/stores/models/_order.py

@@ -41,10 +41,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 +79,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 +88,10 @@ 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(
-        null=True,
-        blank=True,
-    )
+    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)
     # TODO: add pick_up_time maybe ?
     # audit fields
     created_at = models.DateTimeField(auto_now_add=True)
@@ -195,10 +188,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 +267,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:

ob_dj_store/core/stores/models/_payment.py

@@ -75,21 +75,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,

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(
@@ -377,9 +367,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

ob_dj_store/core/stores/models/_store.py

@@ -85,9 +85,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 +147,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 +175,10 @@ 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)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -246,6 +237,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 +252,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,14 +111,10 @@ 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,
@@ -148,14 +137,9 @@ class WalletTransaction(models.Model):
         DEBIT = "DEBIT", _("debit")
 
     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,

ob_dj_store/core/stores/receivers.py

@@ -34,24 +34,19 @@ def create_customer_cart_and_wallet_handler(sender, instance, created, **kwargs)
 
 
 @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 +69,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 +92,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 +111,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.20.2.dist-info → ob_dj_store-0.0.20.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.20.2
+Version: 0.0.20.4
 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