Merge pull request #392 from MySecondLanguage/serializer-updated

Serializer"

Author: MySecondLanguage

nxtbn/order/__init__.py

@@ -153,7 +153,7 @@ class OrderStockReservationStatus(models.TextChoices):
         NOT_RESERVED: The stock has not been reserved for the order.
     """
     RESERVED = 'RESERVED', _('Reserved')
-    RELEASED = 'RELEASED', _('Released')
-    FAILED = 'FAILED', _('Failed')
-    NOT_RESERVED = 'NOT_RESERVED', _('Not Reserved')
+    RELEASED = 'RELEASED', _('Released') # Re-adjust stock after order is cancelled
+    FAILED = 'FAILED', _('Failed') # If failed, that is mean stock is insufficient to fulfill the order, have to fixed it before proceed
+    NOT_RESERVED = 'NOT_RESERVED', _('Not Reserved') # DO NOTHING IF NOT RESERVED, NO NEED VALIDATION
     DISPATCHED = 'DISPATCHED', _('Dispatched')

nxtbn/order/api/dashboard/serializers.py

@@ -13,7 +13,7 @@
 from nxtbn.product.api.dashboard.serializers import ProductVariantSerializer
 from nxtbn.product.models import ProductVariant
 from nxtbn.users.models import User
-from nxtbn.warehouse.utils import deduct_reservation_on_dispatch, release_stock
+from nxtbn.warehouse.utils import deduct_reservation_on_packed_for_dispatch, release_stock
 
 class LineVariantSerializer(serializers.ModelSerializer):
     variant_thumbnail = serializers.SerializerMethodField()
@@ -200,7 +200,7 @@ def validate(self, attrs):
             if current_status == OrderStatus.CANCELLED:
                 raise serializers.ValidationError(_("Order is already cancelled."))
             elif current_status not in [OrderStatus.PENDING, OrderStatus.APPROVED]:
-                raise serializers.ValidationError(_(f"{current_status.value} orders cannot be cancelled."))
+                raise serializers.ValidationError(_(f"{current_status} orders cannot be cancelled."))
 
         if new_status == OrderStatus.PACKED:
             if current_status != OrderStatus.APPROVED:
@@ -228,8 +228,8 @@ def update(self, instance, validated_data):
         if validated_data.get('status') == OrderStatus.CANCELLED:
             release_stock(instance)
 
-        if validated_data.get('status') == OrderStatus.SHIPPED:
-            deduct_reservation_on_dispatch(instance)
+        if validated_data.get('status') == OrderStatus.PACKED:
+            deduct_reservation_on_packed_for_dispatch(instance)
 
         return super().update(instance, validated_data)
 

nxtbn/warehouse/utils.py

@@ -105,9 +105,15 @@ def release_stock(order):
         order.save()
         return order
 
-def deduct_reservation_on_dispatch(order):
-    if order.reservation_status != OrderStockReservationStatus.RESERVED:
-        raise ValidationError("Order stock must be reserved before dispatching.")
+def deduct_reservation_on_packed_for_dispatch(order):
+    if order.reservation_status == OrderStockReservationStatus.FAILED:
+        raise ValidationError("One or more items are not reserved. Please ensure all items are available in stock and reserved before preparing for shipment.")
+    
+    if order.reservation_status == OrderStockReservationStatus.DISPATCHED:
+        raise ValidationError("Order has already been dispatched.")
+    
+    if order.reservation_status == OrderStockReservationStatus.RELEASED:
+        raise ValidationError("Cannot dispatch an order with released stock reservations.")
 
     with transaction.atomic():
         for item in order.line_items.all():