This commit is contained in:
Marwan Alwali 2025-03-26 23:29:32 +03:00
parent 2752026692
commit b0c234b59a
2 changed files with 15 additions and 15 deletions

View File

@ -207,7 +207,7 @@ def dealer_signup(request, *args, **kwargs):
address = wf3.get("address") address = wf3.get("address")
if password != password_confirm: if password != password_confirm:
return JsonResponse({"error": _("Passwords do not match")}, status=400) return JsonResponse({"error": "Passwords do not match."}, status=400)
try: try:
with transaction.atomic(): with transaction.atomic():
@ -2946,7 +2946,7 @@ def delete_note(request, pk):
note = get_object_or_404(models.Notes, pk=pk, created_by=request.user) note = get_object_or_404(models.Notes, pk=pk, created_by=request.user)
lead_pk = note.content_object.pk lead_pk = note.content_object.pk
note.delete() note.delete()
messages.success(request, _("Note deleted successfully")) messages.success(request, _("Note deleted successfully."))
return redirect("lead_detail", pk=lead_pk) return redirect("lead_detail", pk=lead_pk)
@ -4071,7 +4071,7 @@ class LedgerModelListView(LoginRequiredMixin, ListView,ArchiveIndexView):
show_current = False show_current = False
show_visible = False show_visible = False
def get_queryset(self): def get_queryset(self):
qs = super().get_queryset() qs = super().get_queryset()
dealer = get_user_type(self.request) dealer = get_user_type(self.request)
@ -4091,51 +4091,51 @@ class LedgerModelDetailView(LoginRequiredMixin, DetailView):
model = LedgerModel model = LedgerModel
context_object_name = "ledger" context_object_name = "ledger"
template_name = "ledger/ledger/ledger_detail.html" template_name = "ledger/ledger/ledger_detail.html"
# class LedgerModelCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView): # class LedgerModelCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView):
# model = LedgerModel # model = LedgerModel
# template_name = "ledger/ledger/ledger_form.html" # template_name = "ledger/ledger/ledger_form.html"
# form_class = forms.LedgerModelCreateForm # form_class = forms.LedgerModelCreateForm
# success_message = "Ledger created" # success_message = "Ledger created"
# def get_form(self, form_class=None): # def get_form(self, form_class=None):
# dealer = get_user_type(self.request) # dealer = get_user_type(self.request)
# form = forms.LedgerModelCreateForm(entity_slug=dealer.entity.slug,user_model=dealer.entity.admin,**self.get_form_kwargs()) # form = forms.LedgerModelCreateForm(entity_slug=dealer.entity.slug,user_model=dealer.entity.admin,**self.get_form_kwargs())
# return form # return form
# def get_success_url(self): # def get_success_url(self):
# return reverse('ledger_list') # return reverse('ledger_list')
# def form_valid(self, form): # def form_valid(self, form):
# instance = form.save(commit=False) # instance = form.save(commit=False)
# dealer = get_user_type(self.request) # dealer = get_user_type(self.request)
# instance.entity = dealer.entity # instance.entity = dealer.entity
# instance.save() # instance.save()
# return super().form_valid(form) # return super().form_valid(form)
class JournalEntryListView(LoginRequiredMixin, ListView): class JournalEntryListView(LoginRequiredMixin, ListView):
model = JournalEntryModel model = JournalEntryModel
context_object_name = "journal_entries" context_object_name = "journal_entries"
template_name = "ledger/journal_entry/journal_entry_list.html" template_name = "ledger/journal_entry/journal_entry_list.html"
def get_queryset(self): def get_queryset(self):
qs = super().get_queryset() qs = super().get_queryset()
ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first() ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
qs = qs.filter(ledger=ledger) qs = qs.filter(ledger=ledger)
return qs return qs
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['ledger'] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first() context['ledger'] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
return context return context
class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView): class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView):
model = JournalEntryModel model = JournalEntryModel
template_name = "ledger/journal_entry/journal_entry_form.html" template_name = "ledger/journal_entry/journal_entry_form.html"
form_class = forms.JournalEntryModelCreateForm form_class = forms.JournalEntryModelCreateForm
ledger_model = None ledger_model = None
success_message = _("Journal Entry created") success_message = _("Journal Entry created")
def get_form(self, form_class=None): def get_form(self, form_class=None):
dealer = get_user_type(self.request) dealer = get_user_type(self.request)
ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first() ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
@ -4150,11 +4150,11 @@ class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView)
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["ledger"] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first() context["ledger"] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
return context return context
def get_success_url(self): def get_success_url(self):
ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first() ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
return reverse("journalentry_list", kwargs={"pk": ledger.pk}) return reverse("journalentry_list", kwargs={"pk": ledger.pk})
def JournalEntryDeleteView(request,pk): def JournalEntryDeleteView(request,pk):
journal_entry = get_object_or_404(JournalEntryModel, pk=pk) journal_entry = get_object_or_404(JournalEntryModel, pk=pk)
@ -4182,7 +4182,7 @@ def JournalEntryTransactionsView(request, pk):
class JournalEntryModelTXSDetailView(JournalEntryModelTXSDetailViewBase): class JournalEntryModelTXSDetailView(JournalEntryModelTXSDetailViewBase):
template_name = 'ledger/journal_entry/journal_entry_txs.html' template_name = 'ledger/journal_entry/journal_entry_txs.html'
def ledger_lock_all_journals(request,entity_slug,pk): def ledger_lock_all_journals(request,entity_slug,pk):
ledger = LedgerModel.objects.filter(pk=pk).first() ledger = LedgerModel.objects.filter(pk=pk).first()
@ -4199,7 +4199,7 @@ def ledger_unlock_all_journals(request,entity_slug,pk):
if not ledger.is_locked(): if not ledger.is_locked():
messages.error(request, _("Ledger is already Unlocked")) messages.error(request, _("Ledger is already Unlocked"))
return redirect("journalentry_list", pk=ledger.pk) return redirect("journalentry_list", pk=ledger.pk)
ledger.unlock() ledger.unlock()
ledger.save() ledger.save()
qs = ledger.journal_entries.locked() qs = ledger.journal_entries.locked()