ob-dj-store 0.0.13.9__tar.gz → 0.0.13.11__tar.gz

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/PKG-INFO

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

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -715,15 +715,26 @@ class SubCategorySerializer(serializers.ModelSerializer):
         if store_id:
             try:
                 current_availability_hours = AvailabilityHours.objects.get(
-                    weekday=now().weekday() + 1,
+                    weekday=localtime(now()).weekday() + 1,
                     store=store_id,
                     category=obj,
                 )
-                return (
+                parent_availability_hours = AvailabilityHours.objects.get(
+                    weekday=localtime(now()).weekday() + 1,
+                    store=store_id,
+                    category=obj.parent,
+                )
+                is_available_sub = (
                     current_availability_hours.from_hour
-                    <= now().time()
+                    <= localtime(now()).time()
                     <= current_availability_hours.to_hour
                 )
+                is_available_parent = (
+                    parent_availability_hours.from_hour
+                    <= localtime(now()).time()
+                    <= parent_availability_hours.to_hour
+                )
+                return is_available_sub and is_available_parent
             except ObjectDoesNotExist:
                 pass
         return False

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/ob_dj_store/apis/stores/views.py

@@ -56,6 +56,7 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
 )
 from ob_dj_store.core.stores.gateway.tap.utils import TapException
 from ob_dj_store.core.stores.models import (
+    AttributeChoice,
     Cart,
     CartItem,
     Category,
@@ -595,6 +596,19 @@ class ProductView(
                     )
                 ).distinct(),
             ),
+            Prefetch(
+                "product_variants__product_attributes__attribute_choices",
+                queryset=AttributeChoice.objects.filter(
+                    Q(
+                        attribute_inventory__snooze_start_date__gt=now(),
+                        attribute_inventory__store__pk=self.kwargs["store_pk"],
+                    )
+                    | Q(
+                        attribute_inventory__snooze_end_date__lt=now(),
+                        attribute_inventory__store__pk=self.kwargs["store_pk"],
+                    )
+                ).distinct(),
+            ),
         ).distinct()
         return qs
 

ob-dj-store-0.0.13.11/ob_dj_store/core/stores/migrations/0081_storeattributechoice.py

@@ -0,0 +1,64 @@
+# Generated by Django 3.2.8 on 2023-05-15 11:10
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0080_productvariant_description"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="StoreAttributeChoice",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "snooze_start_date",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        help_text="When snooze status should begin",
+                    ),
+                ),
+                (
+                    "snooze_end_date",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        help_text="When snooze status should end",
+                    ),
+                ),
+                (
+                    "attribute",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="attribute_inventory",
+                        to="stores.attributechoice",
+                    ),
+                ),
+                (
+                    "store",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="attribute_inventory",
+                        to="stores.store",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Store Attribute Choice",
+                "verbose_name_plural": "Store Attribute Choices",
+                "unique_together": {("store", "attribute")},
+            },
+        ),
+    ]

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/ob_dj_store/core/stores/models/__init__.py

@@ -19,6 +19,7 @@ from ob_dj_store.core.stores.models._product import (
     ProductMedia,
     ProductTag,
     ProductVariant,
+    StoreAttributeChoice,
 )
 from ob_dj_store.core.stores.models._store import (
     OpeningHours,
@@ -67,4 +68,5 @@ __all__ = [
     "FavoriteExtra",
     "WalletMedia",
     "AvailabilityHours",
+    "StoreAttributeChoice",
 ]

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/ob_dj_store/core/stores/models/_product.py

@@ -1,6 +1,7 @@
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import RegexValidator
 from django.db import models
+from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
 from ob_dj_store.core.stores.managers import (
@@ -263,6 +264,33 @@ class AttributeChoice(DjangoModelCleanMixin, models.Model):
         return f"{self.name}: Attribute Choice  (PK={self.pk})"
 
 
+class StoreAttributeChoice(models.Model):
+    store = models.ForeignKey(
+        Store, on_delete=models.CASCADE, related_name="attribute_inventory"
+    )
+    attribute = models.ForeignKey(
+        AttributeChoice, on_delete=models.CASCADE, related_name="attribute_inventory"
+    )
+    snooze_start_date = models.DateTimeField(
+        default=now, help_text=_("When snooze status should begin")
+    )
+    snooze_end_date = models.DateTimeField(
+        default=now, help_text=_("When snooze status should end")
+    )
+
+    class Meta:
+        verbose_name = _("Store Attribute Choice")
+        verbose_name_plural = _("Store Attribute Choices")
+        unique_together = (("store", "attribute"),)
+
+    def __str__(self) -> str:
+        return f"StoreProductAttribute(PK={self.pk})"
+
+    @property
+    def is_snoozed(self):
+        return self.snooze_start_date <= now() <= self.snooze_end_date
+
+
 class ProductAttribute(DjangoModelCleanMixin, models.Model):
     """
     ProductAttribute represent a characteristic -attribute- with is choices -attribute_choices-

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/ob_dj_store.egg-info/PKG-INFO

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

{ob-dj-store-0.0.13.9 → ob-dj-store-0.0.13.11}/ob_dj_store.egg-info/SOURCES.txt

@@ -149,6 +149,7 @@ ob_dj_store/core/stores/migrations/0077_auto_20230502_2005.py
 ob_dj_store/core/stores/migrations/0078_auto_20230503_1259.py
 ob_dj_store/core/stores/migrations/0079_auto_20230504_1919.py
 ob_dj_store/core/stores/migrations/0080_productvariant_description.py
+ob_dj_store/core/stores/migrations/0081_storeattributechoice.py
 ob_dj_store/core/stores/migrations/__init__.py
 ob_dj_store/core/stores/models/__init__.py
 ob_dj_store/core/stores/models/_address.py