|
|
@@ -9,11 +9,13 @@ import django_filters as filters
|
|
9
|
9
|
from admin_frontend.templatetags.public_urls import public_route
|
|
10
|
10
|
from admin_frontend.nav import _nav_items
|
|
11
|
11
|
from cms.views import breadcrumbs
|
|
|
12
|
+from orgs.decorators import permissions_required
|
|
12
|
13
|
|
|
13
|
14
|
from orgs.models import Organization, UserProfile
|
|
14
|
15
|
from .models import (
|
|
15
|
16
|
MaterialCategory,
|
|
16
|
17
|
Material,
|
|
|
18
|
+ MaterialImage,
|
|
17
|
19
|
ProvidedService,
|
|
18
|
20
|
Customer,
|
|
19
|
21
|
CustomerSite,
|
|
|
@@ -22,11 +24,8 @@ from .models import (
|
|
22
|
24
|
WeighLine,
|
|
23
|
25
|
ScrapListing,
|
|
24
|
26
|
ScrapBid,
|
|
25
|
|
- Invoice,
|
|
26
|
|
- Payment,
|
|
27
|
27
|
Document,
|
|
28
|
28
|
AuditLog,
|
|
29
|
|
- Payout,
|
|
30
|
29
|
)
|
|
31
|
30
|
from .forms import (
|
|
32
|
31
|
MaterialForm,
|
|
|
@@ -34,14 +33,16 @@ from .forms import (
|
|
34
|
33
|
CustomerForm,
|
|
35
|
34
|
PickupAssignForm,
|
|
36
|
35
|
PickupStatusForm,
|
|
37
|
|
- PaymentForm,
|
|
38
|
36
|
DocumentForm,
|
|
39
|
37
|
ProvidedServiceForm,
|
|
|
38
|
+ WeighTicketForm,
|
|
40
|
39
|
)
|
|
41
|
40
|
from .services.billing import generate_invoice_for_pickup
|
|
42
|
41
|
from django.contrib.contenttypes.models import ContentType
|
|
43
|
42
|
from django.contrib.auth import get_user_model
|
|
44
|
|
-from django.http import HttpResponse
|
|
|
43
|
+from django.http import HttpResponse, JsonResponse
|
|
|
44
|
+from django.db import transaction
|
|
|
45
|
+import json
|
|
45
|
46
|
import csv
|
|
46
|
47
|
from django.db.models import Sum, F, ExpressionWrapper, DecimalField, Value
|
|
47
|
48
|
from django.db.models.functions import Coalesce
|
|
|
@@ -186,12 +187,20 @@ def org_user_create(request):
|
|
186
|
187
|
if request.method == "POST":
|
|
187
|
188
|
if form.is_valid():
|
|
188
|
189
|
User = get_user_model()
|
|
189
|
|
- user = User.objects.create(username=form.cleaned_data["username"], email=form.cleaned_data.get("email") or "")
|
|
|
190
|
+ user = User.objects.create(
|
|
|
191
|
+ username=form.cleaned_data["username"],
|
|
|
192
|
+ email=form.cleaned_data.get("email") or "",
|
|
|
193
|
+ first_name=form.cleaned_data.get("first_name") or "",
|
|
|
194
|
+ last_name=form.cleaned_data.get("last_name") or "",
|
|
|
195
|
+ )
|
|
190
|
196
|
user.set_password(form.cleaned_data["password1"])
|
|
191
|
197
|
user.save()
|
|
192
|
198
|
org = getattr(request, "org", None)
|
|
193
|
199
|
UserProfile.objects.create(user=user, organization=org, role=form.cleaned_data["role"]) # type: ignore[arg-type]
|
|
194
|
200
|
messages.success(request, f"User '{user.username}' created.")
|
|
|
201
|
+ next_url = request.POST.get("next") or request.GET.get("next")
|
|
|
202
|
+ if next_url:
|
|
|
203
|
+ return redirect(next_url)
|
|
195
|
204
|
return redirect("recycle_core:org_users_list")
|
|
196
|
205
|
messages.error(request, "Please correct the errors below.")
|
|
197
|
206
|
return render(request, "recycle_core/user_form.html", {"nav": _nav_items(), "form": form, "creating": True, "cancel_url": reverse("recycle_core:org_users_list")})
|
|
|
@@ -210,11 +219,15 @@ def org_user_edit(request, pk: int):
|
|
210
|
219
|
profile = getattr(user, "recycle_profile", None)
|
|
211
|
220
|
form = UserEditForm(request.POST or None, initial={
|
|
212
|
221
|
"email": user.email,
|
|
|
222
|
+ "first_name": user.first_name,
|
|
|
223
|
+ "last_name": user.last_name,
|
|
213
|
224
|
"role": getattr(profile, "role", UserProfile.ROLE_MANAGER),
|
|
214
|
225
|
})
|
|
215
|
226
|
if request.method == "POST":
|
|
216
|
227
|
if form.is_valid():
|
|
217
|
228
|
user.email = form.cleaned_data.get("email") or ""
|
|
|
229
|
+ user.first_name = form.cleaned_data.get("first_name") or ""
|
|
|
230
|
+ user.last_name = form.cleaned_data.get("last_name") or ""
|
|
218
|
231
|
p1 = form.cleaned_data.get("password1")
|
|
219
|
232
|
if p1:
|
|
220
|
233
|
user.set_password(p1)
|
|
|
@@ -226,6 +239,9 @@ def org_user_edit(request, pk: int):
|
|
226
|
239
|
profile.organization = org
|
|
227
|
240
|
profile.save()
|
|
228
|
241
|
messages.success(request, f"User '{user.username}' updated.")
|
|
|
242
|
+ next_url = request.POST.get("next") or request.GET.get("next")
|
|
|
243
|
+ if next_url:
|
|
|
244
|
+ return redirect(next_url)
|
|
229
|
245
|
return redirect("recycle_core:org_users_list")
|
|
230
|
246
|
messages.error(request, "Please correct the errors below.")
|
|
231
|
247
|
return render(request, "recycle_core/user_form.html", {"nav": _nav_items(), "form": form, "item": user, "creating": False, "cancel_url": reverse("recycle_core:org_users_list")})
|
|
|
@@ -277,6 +293,36 @@ def material_delete(request, pk: int):
|
|
277
|
293
|
|
|
278
|
294
|
|
|
279
|
295
|
@staff_member_required
|
|
|
296
|
+@require_POST
|
|
|
297
|
+def material_images_reorder(request, pk: int):
|
|
|
298
|
+ """Reorder MaterialImage.display_order for a material.
|
|
|
299
|
+
|
|
|
300
|
+ Expects JSON {"ids": [image_id, ...]} in the new order.
|
|
|
301
|
+ """
|
|
|
302
|
+ material = get_object_or_404(Material, pk=pk)
|
|
|
303
|
+ try:
|
|
|
304
|
+ payload = json.loads(request.body.decode("utf-8"))
|
|
|
305
|
+ ids = payload.get("ids", [])
|
|
|
306
|
+ if not isinstance(ids, list):
|
|
|
307
|
+ return JsonResponse({"ok": False, "error": "Invalid payload"}, status=400)
|
|
|
308
|
+ except Exception:
|
|
|
309
|
+ return JsonResponse({"ok": False, "error": "Malformed JSON"}, status=400)
|
|
|
310
|
+
|
|
|
311
|
+ imgs = MaterialImage.objects.filter(material=material, id__in=ids)
|
|
|
312
|
+ img_map = {im.id: im for im in imgs}
|
|
|
313
|
+ with transaction.atomic():
|
|
|
314
|
+ for idx, iid in enumerate(ids):
|
|
|
315
|
+ im = img_map.get(iid)
|
|
|
316
|
+ if not im:
|
|
|
317
|
+ continue
|
|
|
318
|
+ if im.display_order != idx:
|
|
|
319
|
+ im.display_order = idx
|
|
|
320
|
+ im.save(update_fields=["display_order"])
|
|
|
321
|
+
|
|
|
322
|
+ return JsonResponse({"ok": True})
|
|
|
323
|
+
|
|
|
324
|
+
|
|
|
325
|
+@staff_member_required
|
|
280
|
326
|
@public_route(label="Customers", order=20, icon="building-storefront")
|
|
281
|
327
|
@breadcrumbs(label="Customers", name="re_customers")
|
|
282
|
328
|
def customers_list(request):
|
|
|
@@ -416,6 +462,7 @@ def pickups_list(request):
|
|
416
|
462
|
|
|
417
|
463
|
|
|
418
|
464
|
@staff_member_required
|
|
|
465
|
+@permissions_required('recycle_core.assign_driver', message="You are not allowed to assign drivers for this pickup.")
|
|
419
|
466
|
@require_POST
|
|
420
|
467
|
def pickup_assign(request, pk: int):
|
|
421
|
468
|
pickup = get_object_or_404(PickupOrder, pk=pk)
|
|
|
@@ -431,6 +478,7 @@ def pickup_assign(request, pk: int):
|
|
431
|
478
|
|
|
432
|
479
|
|
|
433
|
480
|
@staff_member_required
|
|
|
481
|
+@permissions_required('recycle_core.set_pickup_status', message="You are not allowed to change status for this pickup.")
|
|
434
|
482
|
@require_POST
|
|
435
|
483
|
def pickup_set_status(request, pk: int):
|
|
436
|
484
|
pickup = get_object_or_404(PickupOrder, pk=pk)
|
|
|
@@ -445,6 +493,58 @@ def pickup_set_status(request, pk: int):
|
|
445
|
493
|
|
|
446
|
494
|
|
|
447
|
495
|
@staff_member_required
|
|
|
496
|
+@breadcrumbs(label="Pickup Detail", parent="re_pickups")
|
|
|
497
|
+def pickup_detail(request, pk: int):
|
|
|
498
|
+ pickup = get_object_or_404(
|
|
|
499
|
+ PickupOrder.objects.select_related("organization", "customer", "site", "assigned_driver"), pk=pk
|
|
|
500
|
+ )
|
|
|
501
|
+ items = pickup.items.select_related("material").all()
|
|
|
502
|
+ context = {
|
|
|
503
|
+ "nav": _nav_items(),
|
|
|
504
|
+ "pickup": pickup,
|
|
|
505
|
+ "items": items,
|
|
|
506
|
+ }
|
|
|
507
|
+ return render(request, "recycle_core/pickup_detail.html", context)
|
|
|
508
|
+
|
|
|
509
|
+
|
|
|
510
|
+@staff_member_required
|
|
|
511
|
+@permissions_required('recycle_core.create_weigh_ticket', message="You are not allowed to create weigh tickets.")
|
|
|
512
|
+def pickup_create_weigh_ticket(request, pk: int):
|
|
|
513
|
+ pickup = get_object_or_404(PickupOrder.objects.select_related("customer", "organization"), pk=pk)
|
|
|
514
|
+ if hasattr(pickup, "weigh_ticket"):
|
|
|
515
|
+ messages.info(request, "Weigh ticket already exists for this pickup.")
|
|
|
516
|
+ return redirect("recycle_core:weigh_ticket_detail", pk=pickup.weigh_ticket.id)
|
|
|
517
|
+
|
|
|
518
|
+ if request.method == "POST":
|
|
|
519
|
+ form = WeighTicketForm(request.POST)
|
|
|
520
|
+ if form.is_valid():
|
|
|
521
|
+ wt = WeighTicket.objects.create(
|
|
|
522
|
+ pickup=pickup,
|
|
|
523
|
+ ticket_number=form.cleaned_data.get("ticket_number") or "",
|
|
|
524
|
+ gross_weight=form.cleaned_data["gross_weight"],
|
|
|
525
|
+ tare_weight=form.cleaned_data["tare_weight"],
|
|
|
526
|
+ net_weight=form.cleaned_data["net_weight"],
|
|
|
527
|
+ unit=form.cleaned_data["unit"],
|
|
|
528
|
+ recorded_by=request.user,
|
|
|
529
|
+ )
|
|
|
530
|
+ pickup.status = PickupOrder.STATUS_WEIGHED
|
|
|
531
|
+ pickup.save(update_fields=["status"])
|
|
|
532
|
+ messages.success(request, f"Weigh ticket {wt.ticket_number or wt.id} created.")
|
|
|
533
|
+ return redirect("recycle_core:weigh_ticket_detail", pk=wt.id)
|
|
|
534
|
+ messages.error(request, "Please correct the form errors.")
|
|
|
535
|
+ else:
|
|
|
536
|
+ form = WeighTicketForm()
|
|
|
537
|
+
|
|
|
538
|
+ context = {
|
|
|
539
|
+ "nav": _nav_items(),
|
|
|
540
|
+ "pickup": pickup,
|
|
|
541
|
+ "form": form,
|
|
|
542
|
+ }
|
|
|
543
|
+ return render(request, "recycle_core/weigh_ticket_form.html", context)
|
|
|
544
|
+
|
|
|
545
|
+
|
|
|
546
|
+@staff_member_required
|
|
|
547
|
+@permissions_required('recycle_core.generate_invoice', message="You are not allowed to generate invoices.")
|
|
448
|
548
|
@require_POST
|
|
449
|
549
|
def pickup_generate_invoice(request, pk: int):
|
|
450
|
550
|
pickup = get_object_or_404(PickupOrder, pk=pk)
|
|
|
@@ -619,6 +719,7 @@ def weigh_ticket_detail(request, pk: int):
|
|
619
|
719
|
|
|
620
|
720
|
|
|
621
|
721
|
@staff_member_required
|
|
|
722
|
+@permissions_required('recycle_core.generate_invoice', message="You are not allowed to generate invoices.")
|
|
622
|
723
|
@require_POST
|
|
623
|
724
|
def weigh_ticket_generate_invoice(request, pk: int):
|
|
624
|
725
|
ticket = get_object_or_404(WeighTicket, pk=pk)
|
|
|
@@ -630,164 +731,7 @@ def weigh_ticket_generate_invoice(request, pk: int):
|
|
630
|
731
|
return redirect("recycle_core:weigh_tickets_list")
|
|
631
|
732
|
|
|
632
|
733
|
|
|
633
|
|
-# Invoices UI ---------------------------------------------------------------
|
|
634
|
|
-
|
|
635
|
|
-@staff_member_required
|
|
636
|
|
-@public_route(label="Invoices", order=50, icon="receipt-percent")
|
|
637
|
|
-@breadcrumbs(label="Invoices", name="re_invoices")
|
|
638
|
|
-def invoices_list(request):
|
|
639
|
|
- class InvoiceFilter(filters.FilterSet):
|
|
640
|
|
- organization = filters.ModelChoiceFilter(queryset=Organization.objects.all())
|
|
641
|
|
- customer = filters.ModelChoiceFilter(queryset=Customer.objects.all())
|
|
642
|
|
- status = filters.ChoiceFilter(field_name="status", choices=Invoice.STATUS_CHOICES)
|
|
643
|
|
- issued_at = filters.DateFromToRangeFilter(field_name="issued_at", label="Issued between")
|
|
644
|
|
-
|
|
645
|
|
- class Meta:
|
|
646
|
|
- model = Invoice
|
|
647
|
|
- fields = ["organization", "customer", "status", "issued_at"]
|
|
648
|
|
-
|
|
649
|
|
- base_qs = (
|
|
650
|
|
- Invoice.objects.select_related("organization", "customer")
|
|
651
|
|
- .annotate(
|
|
652
|
|
- payments_total=Coalesce(
|
|
653
|
|
- Sum("payments__amount"),
|
|
654
|
|
- Value(Decimal("0.00")),
|
|
655
|
|
- output_field=DecimalField(max_digits=14, decimal_places=2),
|
|
656
|
|
- ),
|
|
657
|
|
- )
|
|
658
|
|
- .annotate(
|
|
659
|
|
- balance=ExpressionWrapper(
|
|
660
|
|
- F("total_amount") - F("payments_total"),
|
|
661
|
|
- output_field=DecimalField(max_digits=14, decimal_places=2),
|
|
662
|
|
- )
|
|
663
|
|
- )
|
|
664
|
|
- .order_by("-issued_at", "-id")
|
|
665
|
|
- )
|
|
666
|
|
- i_filter = InvoiceFilter(request.GET, queryset=base_qs)
|
|
667
|
|
- qs = i_filter.qs
|
|
668
|
|
- org = getattr(request, "org", None)
|
|
669
|
|
- if org is not None:
|
|
670
|
|
- qs = qs.filter(organization=org)
|
|
671
|
|
-
|
|
672
|
|
- paginator = Paginator(qs, 10)
|
|
673
|
|
- page = request.GET.get("page")
|
|
674
|
|
- try:
|
|
675
|
|
- page_obj = paginator.page(page)
|
|
676
|
|
- except PageNotAnInteger:
|
|
677
|
|
- page_obj = paginator.page(1)
|
|
678
|
|
- except EmptyPage:
|
|
679
|
|
- page_obj = paginator.page(paginator.num_pages)
|
|
680
|
|
-
|
|
681
|
|
- pay_form = PaymentForm()
|
|
682
|
|
- context = {
|
|
683
|
|
- "nav": _nav_items(),
|
|
684
|
|
- "invoices": page_obj.object_list,
|
|
685
|
|
- "page_obj": page_obj,
|
|
686
|
|
- "filter": i_filter,
|
|
687
|
|
- "pay_form": pay_form,
|
|
688
|
|
- }
|
|
689
|
|
- return render(request, "recycle_core/invoices_list.html", context)
|
|
690
|
|
-
|
|
691
|
|
-
|
|
692
|
|
-@staff_member_required
|
|
693
|
|
-@require_POST
|
|
694
|
|
-def invoice_add_payment(request, pk: int):
|
|
695
|
|
- invoice = get_object_or_404(Invoice, pk=pk)
|
|
696
|
|
- form = PaymentForm(request.POST)
|
|
697
|
|
- if form.is_valid():
|
|
698
|
|
- Payment.objects.create(
|
|
699
|
|
- invoice=invoice,
|
|
700
|
|
- amount=form.cleaned_data["amount"],
|
|
701
|
|
- currency_code=invoice.currency_code,
|
|
702
|
|
- received_at=form.cleaned_data.get("received_at") or None,
|
|
703
|
|
- reference=form.cleaned_data.get("reference", ""),
|
|
704
|
|
- )
|
|
705
|
|
- messages.success(request, f"Payment recorded for invoice #{invoice.id}.")
|
|
706
|
|
- else:
|
|
707
|
|
- messages.error(request, "Invalid payment data.")
|
|
708
|
|
- return redirect("recycle_core:invoices_list")
|
|
709
|
|
-
|
|
710
|
|
-
|
|
711
|
|
-# Payouts UI + CSV ----------------------------------------------------------
|
|
712
|
|
-
|
|
713
|
|
-@staff_member_required
|
|
714
|
|
-@public_route(label="Payouts", order=52, icon="banknotes")
|
|
715
|
|
-@breadcrumbs(label="Payouts", name="re_payouts")
|
|
716
|
|
-def payouts_list(request):
|
|
717
|
|
- class PayoutFilter(filters.FilterSet):
|
|
718
|
|
- organization = filters.ModelChoiceFilter(queryset=Organization.objects.all())
|
|
719
|
|
- customer = filters.ModelChoiceFilter(queryset=Customer.objects.all())
|
|
720
|
|
- paid_at = filters.DateFromToRangeFilter(field_name="paid_at", label="Paid between")
|
|
721
|
|
-
|
|
722
|
|
- class Meta:
|
|
723
|
|
- model = Payout
|
|
724
|
|
- fields = ["organization", "customer", "paid_at"]
|
|
725
|
|
-
|
|
726
|
|
- base_qs = Payout.objects.select_related("organization", "customer").order_by("-paid_at", "-id")
|
|
727
|
|
- p_filter = PayoutFilter(request.GET, queryset=base_qs)
|
|
728
|
|
- qs = p_filter.qs
|
|
729
|
|
- org = getattr(request, "org", None)
|
|
730
|
|
- if org is not None:
|
|
731
|
|
- qs = qs.filter(organization=org)
|
|
732
|
|
-
|
|
733
|
|
- paginator = Paginator(qs, 10)
|
|
734
|
|
- page = request.GET.get("page")
|
|
735
|
|
- try:
|
|
736
|
|
- page_obj = paginator.page(page)
|
|
737
|
|
- except PageNotAnInteger:
|
|
738
|
|
- page_obj = paginator.page(1)
|
|
739
|
|
- except EmptyPage:
|
|
740
|
|
- page_obj = paginator.page(paginator.num_pages)
|
|
741
|
|
-
|
|
742
|
|
- context = {
|
|
743
|
|
- "nav": _nav_items(),
|
|
744
|
|
- "payouts": page_obj.object_list,
|
|
745
|
|
- "page_obj": page_obj,
|
|
746
|
|
- "filter": p_filter,
|
|
747
|
|
- }
|
|
748
|
|
- return render(request, "recycle_core/payouts_list.html", context)
|
|
749
|
|
-
|
|
750
|
|
-
|
|
751
|
|
-@staff_member_required
|
|
752
|
|
-def payouts_export_csv(request):
|
|
753
|
|
- qs = Payout.objects.select_related("organization", "customer").all()
|
|
754
|
|
- org_obj = getattr(request, "org", None)
|
|
755
|
|
- if org_obj is not None:
|
|
756
|
|
- qs = qs.filter(organization=org_obj)
|
|
757
|
|
- org = request.GET.get("organization")
|
|
758
|
|
- cust = request.GET.get("customer")
|
|
759
|
|
- start = request.GET.get("paid_at_after") or request.GET.get("paid_at_min")
|
|
760
|
|
- end = request.GET.get("paid_at_before") or request.GET.get("paid_at_max")
|
|
761
|
|
- from django.utils.dateparse import parse_datetime
|
|
762
|
|
-
|
|
763
|
|
- if org:
|
|
764
|
|
- qs = qs.filter(organization_id=org)
|
|
765
|
|
- if cust:
|
|
766
|
|
- qs = qs.filter(customer_id=cust)
|
|
767
|
|
- if start:
|
|
768
|
|
- dt = parse_datetime(start)
|
|
769
|
|
- if dt:
|
|
770
|
|
- qs = qs.filter(paid_at__gte=dt)
|
|
771
|
|
- if end:
|
|
772
|
|
- dt = parse_datetime(end)
|
|
773
|
|
- if dt:
|
|
774
|
|
- qs = qs.filter(paid_at__lte=dt)
|
|
775
|
|
-
|
|
776
|
|
- response = HttpResponse(content_type="text/csv")
|
|
777
|
|
- response["Content-Disposition"] = "attachment; filename=payouts.csv"
|
|
778
|
|
- writer = csv.writer(response)
|
|
779
|
|
- writer.writerow(["organization", "customer", "amount", "currency", "paid_at", "reference", "pickup_id"])
|
|
780
|
|
- for p in qs.iterator():
|
|
781
|
|
- writer.writerow([
|
|
782
|
|
- p.organization.code,
|
|
783
|
|
- p.customer.name,
|
|
784
|
|
- p.amount,
|
|
785
|
|
- p.currency_code,
|
|
786
|
|
- p.paid_at.isoformat(),
|
|
787
|
|
- p.reference,
|
|
788
|
|
- p.pickup_id or "",
|
|
789
|
|
- ])
|
|
790
|
|
- return response
|
|
|
734
|
+# Billing-related views moved to billing/views.py
|
|
791
|
735
|
|
|
792
|
736
|
|
|
793
|
737
|
# Documents UI --------------------------------------------------------------
|
|
|
@@ -1024,3 +968,36 @@ def service_toggle_enabled(request, pk: int):
|
|
1024
|
968
|
item.save(update_fields=["is_enabled"])
|
|
1025
|
969
|
messages.success(request, f"Service '{item.title}' {'enabled' if item.is_enabled else 'disabled'}.")
|
|
1026
|
970
|
return redirect("recycle_core:services_list")
|
|
|
971
|
+
|
|
|
972
|
+
|
|
|
973
|
+@require_POST
|
|
|
974
|
+@owner_required
|
|
|
975
|
+def services_reorder(request):
|
|
|
976
|
+ """Reorder ProvidedService.display_order for the current organization.
|
|
|
977
|
+
|
|
|
978
|
+ Expects JSON body with {"ids": [<service_id>, ...]} in the new order (top→bottom).
|
|
|
979
|
+ """
|
|
|
980
|
+ try:
|
|
|
981
|
+ data = json.loads(request.body.decode("utf-8"))
|
|
|
982
|
+ ids = data.get("ids", [])
|
|
|
983
|
+ if not isinstance(ids, list):
|
|
|
984
|
+ return JsonResponse({"ok": False, "error": "Invalid payload."}, status=400)
|
|
|
985
|
+ except Exception:
|
|
|
986
|
+ return JsonResponse({"ok": False, "error": "Malformed JSON."}, status=400)
|
|
|
987
|
+
|
|
|
988
|
+ org = getattr(request, "org", None)
|
|
|
989
|
+ # Fetch only services belonging to this org and requested ids
|
|
|
990
|
+ qs = ProvidedService.objects.filter(organization=org, id__in=ids)
|
|
|
991
|
+ existing = {obj.id: obj for obj in qs}
|
|
|
992
|
+
|
|
|
993
|
+ # Enforce order based on the incoming list; skip unknown ids
|
|
|
994
|
+ with transaction.atomic():
|
|
|
995
|
+ for idx, sid in enumerate(ids):
|
|
|
996
|
+ obj = existing.get(sid)
|
|
|
997
|
+ if not obj:
|
|
|
998
|
+ continue
|
|
|
999
|
+ if obj.display_order != idx:
|
|
|
1000
|
+ obj.display_order = idx
|
|
|
1001
|
+ obj.save(update_fields=["display_order"])
|
|
|
1002
|
+
|
|
|
1003
|
+ return JsonResponse({"ok": True})
|