ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend

Browse Source
This commit is contained in:
Faheedkhan 2025-08-07 15:57:56 +03:00
commit f545f84f5c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inventory/views.py
View File

@ -2466,7 +2466,7 @@ class CustomerCreateView(
success_message = _("Customer created successfully") success_message = _("Customer created successfully")
def form_valid(self, form): def form_valid(self, form):
dealer = self.request.kwargs.get("dealer_slug") dealer = self.kwargs.get("dealer_slug")
if customer := models.Customer.objects.filter( if customer := models.Customer.objects.filter(
dealer=dealer, dealer=dealer,
email=form.instance.email email=form.instance.email
@ -2690,7 +2690,7 @@ class VendorCreateView(
permission_required = ["inventory.add_vendor"] permission_required = ["inventory.add_vendor"]
def form_valid(self, form): def form_valid(self, form):
dealer = self.request.kwargs["dealer_slug"] dealer = self.kwargs["dealer_slug"]
if vendor := models.Vendor.objects.filter(dealer=dealer,email=form.instance.email).first(): if vendor := models.Vendor.objects.filter(dealer=dealer,email=form.instance.email).first():
if not vendor.active: if not vendor.active:
messages.error( messages.error(
@ -3671,7 +3671,7 @@ class OrganizationCreateView(LoginRequiredMixin, PermissionRequiredMixin, Create
success_message = _("Organization created successfully") success_message = _("Organization created successfully")
def form_valid(self, form): def form_valid(self, form):
dealer = self.request.kwargs["dealer_slug"] dealer = self.kwargs["dealer_slug"]
if organization := models.Organization.objects.filter( if organization := models.Organization.objects.filter(
dealer=dealer, dealer=dealer,
email=form.instance.email email=form.instance.email
@ -11156,6 +11156,7 @@ def help_center(request):
return render(request, 'support/help_center.html') return render(request, 'support/help_center.html')
@login_required @login_required
@permission_required('inventory.add_ticket')
def create_ticket(request): def create_ticket(request):
if not request.is_dealer: if not request.is_dealer:
return redirect('home') return redirect('home')
@ -11174,6 +11175,7 @@ def create_ticket(request):
return render(request, 'support/create_ticket.html', {'form': form}) return render(request, 'support/create_ticket.html', {'form': form})
@login_required @login_required
@permission_required('inventory.view_ticket')
def ticket_list(request): def ticket_list(request):
tickets = models.Ticket.objects.all().order_by('-created_at') tickets = models.Ticket.objects.all().order_by('-created_at')
if request.is_dealer: if request.is_dealer:
@ -11181,10 +11183,13 @@ def ticket_list(request):
return render(request, 'support/ticket_list.html', {'tickets': tickets}) return render(request, 'support/ticket_list.html', {'tickets': tickets})
@login_required @login_required
@permission_required('inventory.change_ticket')
def ticket_detail(request, ticket_id): def ticket_detail(request, ticket_id):
ticket = models.Ticket.objects.get(id=ticket_id) ticket = models.Ticket.objects.get(id=ticket_id)
return render(request, 'support/ticket_detail.html', {'ticket': ticket}) return render(request, 'support/ticket_detail.html', {'ticket': ticket})
@login_required @login_required
@permission_required('inventory.change_ticket')
def ticket_mark_resolved(request, ticket_id): def ticket_mark_resolved(request, ticket_id):
ticket = models.Ticket.objects.get(id=ticket_id) ticket = models.Ticket.objects.get(id=ticket_id)
ticket.status = 'resolved' ticket.status = 'resolved'
@ -11200,6 +11205,8 @@ def ticket_mark_resolved(request, ticket_id):
) )
return render(request, 'support/ticket_detail.html', {'ticket': ticket}) return render(request, 'support/ticket_detail.html', {'ticket': ticket})
@login_required
@permission_required('inventory.change_ticket')
def ticket_update(request, ticket_id): def ticket_update(request, ticket_id):
ticket = models.Ticket.objects.get(id=ticket_id) ticket = models.Ticket.objects.get(id=ticket_id)