From eefdde469343da04c8f2eece8a8305cee2377fba Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 12:12:23 +0200 Subject: [PATCH] Removed section whith superfluous 'price_per_unit < 0' check. Removed calc_price-caculation followed by shift of inputDate. --- library/src/calculator_functions.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 39dbec8..5f0251e 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -201,16 +201,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, if (price_per_unit < 0) price_per_unit = 1.0f; - if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED"; + // if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED"; LOG_DEBUG("Calculated price per minute: ", price_per_unit); - if (price_per_unit < 0) - { - inputDate = inputDate.addDays(1); - inputDate.setTime(worktime_from); - return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true); - } - // If overtime flag is set if (overtime || nextDay) { @@ -314,12 +307,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, // } double ret_val = 0; - double calc_price = (int)total_duration_min - (int)price / price_per_unit; + // double calc_price = (int)total_duration_min - (int)price / price_per_unit; - if (calc_price > 0 && total_duration_min > 0) - { - inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60); - } + //if (calc_price > 0 && total_duration_min > 0) + //{ + // inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60); + //} if(price >= min_price && total_duration_min >= minMin) qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);