Skip to content

Commit

Permalink
Pay invoice report
Browse files Browse the repository at this point in the history
  • Loading branch information
lexxai committed Apr 18, 2024
1 parent 556f514 commit 477cc43
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
23 changes: 19 additions & 4 deletions FRONTEND/fastparking/finance/views.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
from datetime import datetime
import pytz
from django.urls import resolve
from django.shortcuts import render, redirect
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User

from photos.repository import build_html_image
from photos.repository import (
build_html_image,
calculate_invoice,
)
from .forms import TariffForm, PaymentsForm


Expand Down Expand Up @@ -71,17 +76,27 @@ def add_pay(request):
if form.is_valid():
instance = form.save()
currency = "UAH"
exit_datetime = datetime.utcnow().replace(tzinfo=pytz.utc)
invoice_calculated = calculate_invoice(
instance.registration_id.entry_datetime,
exit_datetime,
instance.registration_id.tariff_in,
)
amount_formatted = f"{instance.amount:.2f} {currency}"
date_formated = instance.datetime.strftime("%Y-%m-%d %H:%M:%S")
payment_id_formatted = f"{instance.id:06}"
registration_id_formatted = f"{instance.registration_id.id:06}"
parking_place = instance.registration_id.parking.number
car_number_in = instance.registration_id.car_number_in
if instance.registration_id.invoice:
invoice = float(instance.registration_id.invoice)
invoice_formatted = f"{invoice:.2f} {currency}"
if invoice_calculated:
invoice_formatted = f"{invoice_calculated:.2f} {currency}"
else:
invoice_formatted = "--"
# if instance.registration_id.invoice:
# invoice = float(instance.registration_id.invoice)
# invoice_formatted = f"{invoice:.2f} {currency}"
# else:
# invoice_formatted = "--"
photo_in = build_html_image(instance.registration_id.photo_in.photo)
payment = {
"Payment ID": payment_id_formatted,
Expand Down
3 changes: 2 additions & 1 deletion FRONTEND/fastparking/photos/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ def calculate_invoice_for_reg_id(
registration_id: int, update_record: bool = False
) -> float | None:
result = None

try:
registration = Registration.objects.get(pk=registration_id)
tariff_in = registration.tariff_in
Expand All @@ -403,7 +404,7 @@ def calculate_invoice_for_reg_id(

except Registration.DoesNotExist as e:
print(f"Error: {e}")

print("calculate_invoice_for_reg_id", registration_id, result)
return result


Expand Down

0 comments on commit 477cc43

Please sign in to comment.