From 2b6d1162003e12f1f30d340e1a045e41458b5b7d Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 27 Nov 2023 16:18:06 +0100 Subject: [PATCH] Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value. --- library/src/calculator_functions.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index abdb439..fb096d3 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -3,6 +3,7 @@ #include "utilities.h" #include "tariff_log.h" #include "tariff_time_range.h" +#include "ticket.h" #include #include @@ -404,9 +405,18 @@ double Calculator::GetCostFromDuration(Configuration* cfg, return GetCostFromDuration(cfg, start_datetime, end_datetime); } - return private_GetCostFromDuration(cfg, start_datetime, - end_datetime, durationMinutes, - nextDay, prepaid); + QDateTime start = start_datetime; + + Ticket t = private_GetCostFromDuration(cfg, start, + end_datetime, durationMinutes, + nextDay, prepaid); + if (t) { + qCritical().noquote() << t; + + return t.getPrice(); + } + + return -1; } int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {