Skip to content

Fixed order life cycle test #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nxtbn/order/api/dashboard/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ def validate(self, attrs):
raise serializers.ValidationError(_("Order is already shipped or delivered."))
if current_status == OrderStatus.RETURNED:
raise serializers.ValidationError(_("Returned orders cannot be re-shipped."))
if current_status != OrderStatus.PACKED:
raise serializers.ValidationError(_("Order must be packed before it can be shipped."))

if new_status == OrderStatus.DELIVERED:
if current_status == OrderStatus.CANCELLED:
Expand Down
3 changes: 0 additions & 3 deletions nxtbn/order/api/dashboard/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,6 @@ def check_permissions(self, request):
status = request.data.get('status')
user = request.user

print(status, 'status')

permission_map = {
OrderStatus.CANCELLED: PermissionsEnum.CAN_CANCEL_ORDER,
OrderStatus.SHIPPED: PermissionsEnum.CAN_SHIP_ORDER,
Expand All @@ -440,7 +438,6 @@ def check_permissions(self, request):
}

required_permission = permission_map.get(status)
print(required_permission, 'required_permission')
if required_permission and not has_required_perm(user, required_permission, Order):
self.permission_denied(
request,
Expand Down
2 changes: 0 additions & 2 deletions nxtbn/order/proccesor/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ def get_shipping_rate_instance(shipping_method_id, address, total_weight):
region__isnull=True,
city__isnull=True
).first()
print(rate, 'rate for country')
return rate

# Global
Expand All @@ -84,7 +83,6 @@ def get_shipping_rate_instance(shipping_method_id, address, total_weight):
region__isnull=True,
city__isnull=True
).first()
print(rate, 'rate for global')
return rate
else:
raise serializers.ValidationError({"details": "We don't ship to this location."})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,11 @@ 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.PACKED}, format='json')
packed = 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)
self.assertEqual(processing.status_code, status.HTTP_200_OK)
self.assertEqual(packed.status_code, status.HTTP_400_BAD_REQUEST) # as order is not reserved, mean is not in stock, so packing should not be allowed

self.assertEqual(shipped.status_code, status.HTTP_400_BAD_REQUEST) # as order is not reserved, it should not be shipped

Expand Down Expand Up @@ -288,6 +288,10 @@ def test_order_back_order_allowed(self):
self.assertEqual(remained_stock_without_bo, 15)
self.assertEqual(reserved_stock_without_bo, 8)

# now pack
packed = self.auth_client.patch(order_status_update_url, {"status": OrderStatus.PACKED}, format='json')
self.assertEqual(packed.status_code, status.HTTP_200_OK) # as order is reserved, it should be packed

# as enough stock is available and order is reserved, now ship the order
shipped = self.auth_client.put(order_status_update_url, {"status": OrderStatus.SHIPPED}, format='json')
self.assertEqual(shipped.status_code, status.HTTP_200_OK)
Expand Down
Loading