Merge pull request #393 from MySecondLanguage/added-image-field-in-variant

Added image field in variant

Author: MySecondLanguage

nxtbn/order/migrations/0038_alter_order_reservation_status.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.11 on 2025-02-20 09:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0037_alter_order_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="order",
+            name="reservation_status",
+            field=models.CharField(
+                choices=[
+                    ("RESERVED", "Reserved"),
+                    ("RELEASED", "Released"),
+                    ("FAILED", "Failed"),
+                    ("NOT_RESERVED", "Not Reserved"),
+                    ("DISPATCHED", "Dispatched"),
+                ],
+                default="NOT_RESERVED",
+                max_length=20,
+            ),
+        ),
+    ]

nxtbn/product/admin_types.py

@@ -7,10 +7,51 @@
 from nxtbn.product.admin_filters import CategoryFilter, CategoryTranslationFilter, CollectionFilter, CollectionTranslationFilter, ProductFilter, ProductTagsFilter, ProductTranslationFilter, TagsTranslationFilter
 
 
+class ProductVariantNonPaginatedType(DjangoObjectType):
+    db_id = graphene.Int(source="id")
+    display_name = graphene.String()
+    humanize_price = graphene.String()
+    variant_thumbnail = graphene.String()
+
+    def resolve_humanize_price(self, info):
+        return self.humanize_total_price()
+    
+    def resolve_variant_thumbnail(self, info):
+        return self.variant_thumbnail(info.context)
+    class Meta:
+        model = ProductVariant
+        fields = (
+            'name',
+            'sku',
+            'track_inventory',
+            'product',
+            'price',
+            'variant_thumbnail',
+            'alias',
+        )
+
+    def resolve_display_name(self, info):
+        if self.name:
+            return self.name
+        
+        if self.sku:
+            return self.product.name + " - " + self.sku
+        
+        return self.product.name + " - " + self.sku
+
+
 
 class ProductGraphType(DjangoObjectType):
     description_html = graphene.String()
     db_id = graphene.Int(source="id")
+    all_variants = graphene.List(ProductVariantNonPaginatedType)
+    product_thumbnail = graphene.String()
+
+    def resolve_all_variants(self, info):
+        return self.variants.all()
+    
+    def resolve_product_thumbnail(self, info):
+        return self.product_thumbnail(info.context)
     class Meta:
         model = Product
         fields = (
@@ -30,8 +71,11 @@ class Meta:
             'tags',
             'tax_class',
             'related_to',
+            'variants',
             'meta_title',
             'meta_description',
+            'all_variants',
+            'product_thumbnail',
         )
 
         interfaces = (relay.Node,)
@@ -105,13 +149,19 @@ class Meta:
         interfaces = (relay.Node,)
         filter_fields = ('name',)
 
+
+
 class ProductVariantAdminType(DjangoObjectType):
     db_id = graphene.Int(source="id")
     display_name = graphene.String()
     humanize_price = graphene.String()
+    variant_thumbnail = graphene.String()
 
     def resolve_humanize_price(self, info):
         return self.humanize_total_price()
+    
+    def resolve_variant_thumbnail(self, info):
+        return self.variant_thumbnail()
     class Meta:
         model = ProductVariant
         fields = (
@@ -120,6 +170,7 @@ class Meta:
             'track_inventory',
             'product',
             'price',
+            'variant_thumbnail',
         )
         interfaces = (relay.Node,)
         filter_fields = ('name', 'sku', 'track_inventory', 'product', 'price')

nxtbn/product/migrations/0019_productvariant_image.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.11 on 2025-02-20 09:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("filemanager", "0002_initial"),
+        ("product", "0018_alter_productvariant_currency"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="productvariant",
+            name="image",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="filemanager.image",
+            ),
+        ),
+    ]

nxtbn/product/models.py

@@ -287,6 +287,7 @@ class ProductVariant(MonetaryMixin, AbstractUUIDModel, AbstractMetadata, models.
 
     product = models.ForeignKey(Product, on_delete=models.CASCADE, related_name='variants')
     name = models.CharField(max_length=255, blank=True, null=True)
+    image = models.ForeignKey(Image, null=True, blank=True, on_delete=models.SET_NULL)
 
     compare_at_price = models.DecimalField(max_digits=12, decimal_places=3, validators=[MinValueValidator(Decimal('0.01'))], null=True, blank=True) # TO DO: Handle this field which is still not used in the project.
 
@@ -369,12 +370,22 @@ def humanize_total_price(self, locale='en_US'):
 
     def variant_thumbnail(self, request):
         """
-        Returns the URL of the first image associated with the variant. 
+        Returns the URL of the first image associated with the product variant. 
         If no image is available, returns None.
         """
+        if self.image and hasattr(self.image, 'image') and self.image.image:
+            image_url = self.image.image.url
+            full_url = request.build_absolute_uri(image_url)
+            return full_url
 
         if self.product.images.exists():
-            return self.product.product_thumbnail(request)
+            first_image = self.product.images.first()
+            if first_image and hasattr(first_image, 'image') and first_image.image:
+                image_url = first_image.image.url
+                full_url = request.build_absolute_uri(image_url)
+                return
+        return None
+        
 
     def get_valid_stock(self): # stocks that available for sell
         stock_data = self.warehouse_stocks.aggregate(