Renamed procesing status to packed

Author: MySecondLanguage

nxtbn/core/enum_perms.py

@@ -5,7 +5,7 @@ class PermissionsEnum(models.TextChoices):
     CAN_APPROVE_ORDER = "can_approve_order"
     CAN_CANCEL_ORDER = "can_cancel_order"
     CAN_SHIP_ORDER = "can_ship_order"
-    CAN_PROCCSS_ORDER = "can_process_order"
+    CAN_PACK_ORDER = "can_pack_order"
     CAN_DELIVER_ORDER = "can_deliver_order"
     CAN_UPDATE_ORDER_PYMENT_TERM = "can_update_order_payment_term"
     CAN_UPDATE_ORDER_PAYMENT_METHOD = "can_update_order_payment_method"

nxtbn/order/__init__.py

@@ -32,7 +32,7 @@ class OrderStatus(models.TextChoices):
     """Defines the different stages of an order's lifecycle.
 
     - 'PENDING': Order has been placed but not yet processed.
-    - 'PROCESSING': Order is being processed and prepared for shipment.
+    - 'PACKED': Order has been processed and is has packed for shipment.
     - 'SHIPPED': Order has been shipped but not yet delivered.
     - 'DELIVERED': Order has been delivered to the customer.
     - 'CANCELLED': Order has been cancelled and will not be fulfilled.
@@ -41,7 +41,7 @@ class OrderStatus(models.TextChoices):
 
     PENDING = "PENDING", _("Pending")
     APPROVED = "APPROVED", _("Approved")
-    PROCESSING = "PROCESSING", _("Processing")
+    PACKED = "PACKED", _("Packed")
     SHIPPED = "SHIPPED", _("Shipped")
     DELIVERED = "DELIVERED", _("Delivered")
     CANCELLED = "CANCELLED", _("Cancelled")

nxtbn/order/api/dashboard/serializers.py

@@ -202,9 +202,9 @@ def validate(self, attrs):
             elif current_status not in [OrderStatus.PENDING, OrderStatus.APPROVED]:
                 raise serializers.ValidationError(_(f"{current_status.value} orders cannot be cancelled."))
 
-        if new_status == OrderStatus.PROCESSING:
+        if new_status == OrderStatus.PACKED:
             if current_status != OrderStatus.APPROVED:
-                raise serializers.ValidationError(_("Only pending orders can be started to processing."))
+                raise serializers.ValidationError(_("Only pending orders can be started for packing."))
 
         if new_status == OrderStatus.SHIPPED:
             if current_status == OrderStatus.CANCELLED:

nxtbn/order/api/dashboard/views.py

@@ -436,7 +436,7 @@ def check_permissions(self, request):
             OrderStatus.SHIPPED: PermissionsEnum.CAN_SHIP_ORDER,
             OrderStatus.DELIVERED: PermissionsEnum.CAN_DELIVER_ORDER,
             OrderStatus.APPROVED: PermissionsEnum.CAN_APPROVE_ORDER,
-            OrderStatus.PROCESSING: PermissionsEnum.CAN_PROCCSS_ORDER,
+            OrderStatus.PACKED: PermissionsEnum.CAN_PACK_ORDER,
         }
 
         required_permission = permission_map.get(status)

nxtbn/order/migrations/0036_alter_order_status.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.11 on 2025-02-17 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0035_alter_order_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="order",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("PENDING", "Pending"),
+                    ("APPROVED", "Approved"),
+                    ("PACKED", "Packed"),
+                    ("SHIPPED", "Shipped"),
+                    ("DELIVERED", "Delivered"),
+                    ("CANCELLED", "Cancelled"),
+                    ("PENDING_RETURN", "Pending Return"),
+                    ("RETURNED", "Returned"),
+                ],
+                default="PENDING",
+                help_text="Represents the current stage of the order within its lifecycle.",
+                max_length=20,
+                verbose_name="Order Status",
+            ),
+        ),
+    ]

nxtbn/order/migrations/0037_alter_order_options.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.11 on 2025-02-17 08:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0036_alter_order_status"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="order",
+            options={
+                "ordering": ("-created_at",),
+                "permissions": [
+                    ("can_approve_order", "Can approve order"),
+                    ("can_cancel_order", "Can cancel order"),
+                    ("can_ship_order", "Can ship order"),
+                    ("can_pack_order", "Can process order"),
+                    ("can_deliver_order", "Can deliver order"),
+                    ("can_update_order_payment_term", "Can update order payment term"),
+                    (
+                        "can_update_order_payment_method",
+                        "Can update order payment method",
+                    ),
+                ],
+            },
+        ),
+    ]

nxtbn/order/models.py

@@ -254,7 +254,7 @@ class Meta:
             (PermissionsEnum.CAN_APPROVE_ORDER, 'Can approve order'),
             (PermissionsEnum.CAN_CANCEL_ORDER, 'Can cancel order'),
             (PermissionsEnum.CAN_SHIP_ORDER, 'Can ship order'),
-            (PermissionsEnum.CAN_PROCCSS_ORDER, 'Can process order'),
+            (PermissionsEnum.CAN_PACK_ORDER, 'Can process order'),
             (PermissionsEnum.CAN_DELIVER_ORDER, 'Can deliver order'),
             (PermissionsEnum.CAN_UPDATE_ORDER_PYMENT_TERM, 'Can update order payment term'),
             (PermissionsEnum.CAN_UPDATE_ORDER_PAYMENT_METHOD, 'Can update order payment method'),

nxtbn/order/tests/test_order_reservation_cancel_shipped_merge_return_sc.py

@@ -109,7 +109,7 @@ def test_order_stock_tracking_with_disallowed_backorder_return(self):
         # Now Ship the successfull order
         order_status_update_url = reverse('order-status-update', args=[order_less_than_stock_response_with_stock_tracking.data['order_alias']])
         approve = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.APPROVED}, format='json')
-        processing = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PROCESSING}, format='json')
+        processing = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PACKED}, format='json')
         approved = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.SHIPPED}, format='json')
 
         self.assertEqual(approve.status_code, status.HTTP_200_OK)
@@ -251,7 +251,7 @@ def test_order_back_order_allowed(self):
         # Now Ship the successfull order
         order_status_update_url = reverse('order-status-update', args=[order_out_of_stock_response_with_stock_tracking_bo.data['order_alias']])
         approve = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.APPROVED}, format='json')
-        processing = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PROCESSING}, format='json')
+        processing = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PACKED}, format='json')
         shipped = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.SHIPPED}, format='json')
 
         self.assertEqual(approve.status_code, status.HTTP_200_OK)
@@ -385,7 +385,7 @@ def test_order_without_tracking_stock(self):
         # Now Ship the successfull order
         order_status_update_url = reverse('order-status-update', args=[order_response.data['order_alias']])
         approve = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.APPROVED}, format='json')
-        processing = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PROCESSING}, format='json')
+        processing = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PACKED}, format='json')
         shipped = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.SHIPPED}, format='json')
 
         self.assertEqual(approve.status_code, status.HTTP_200_OK)