save current state

Some testing added
Minor: removed some debug output.
2024-09-13 10:42:45 +02:00 · 2024-09-11 12:11:49 +02:00 · 2024-09-11 11:56:06 +02:00 · 2024-09-11 11:55:03 +02:00 · 2024-09-11 11:54:16 +02:00 · 2024-09-11 11:49:31 +02:00
17 changed files with 2063 additions and 561 deletions
--- a/library/include/mobilisis/calculator_functions.h
+++ b/library/include/mobilisis/calculator_functions.h
@@ -3,6 +3,7 @@

 #include <iostream>
 #include <optional>
+#include <utility>

 #include "configuration.h"
 #include "calculate_price.h"
@@ -40,12 +41,12 @@ public:
    }

    void ResetTimeSteps(int paymentOptionIndex) {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
            m_timeSteps[paymentOptionIndex].clear();
        }
    }
    QList<int> timeSteps(int paymentOptionIndex=0) const {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
            return m_timeSteps[paymentOptionIndex];
        }
        return QList<int>();
@@ -70,7 +71,8 @@ public:
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z)</param>
 	/// <param name="price"></param>
 	/// <returns>Returns duration in seconds (data type: double)</returns>
-    std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+    std::pair<std::string, QDateTime>
+        GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
                                    PermitType permitType, bool nextDay = false, bool prepaid = false);

 	/// <summary>
@@ -133,10 +135,10 @@ private:
                              int durationMinutes);

    //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
-    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-        return GetPriceForTimeStep(cfg, step);
-    }
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
+    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+    //    return GetPriceForTimeStep(cfg, step, 0);
+    //}
    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
    uint32_t GetStepForPrice(Configuration *cfg, int price) const {
        return GetDurationForPrice(cfg, price);
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -36,6 +36,7 @@
 using namespace std;
 using namespace rapidjson;

+
 class Calculator;
 class Configuration
 {
@@ -48,17 +49,18 @@ public:
    using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
    using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
    using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+    using TariffDurationType = std::multimap<int, ATBDuration>;

    ATBProject project;
    ATBCurrency Currency;
    ATBDuration duration;

-	multimap<int, ATBDuration> Duration;
+    TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
 	SpecialDaysWorktimeType SpecialDaysWorktime;
 	SpecialDaysType SpecialDays;
-	multimap<int, ATBWeekDays> WeekDays;
+    multimap<Qt::DayOfWeek, ATBWeekDay> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
 	ATBPaymentOptionType PaymentOption;
@@ -125,3 +127,15 @@ private:

 	QVector<ATBPaymentOption> currentPaymentOptions;
 };
+
+bool previousDayHoliday(Configuration const &cfg, QDateTime const &t);
+bool isHoliday(Configuration const &cfg, QDateTime const &t);
+int getPaymentOptionIndex(Configuration const &cfg, QDateTime const& dt = QDateTime::currentDateTime());
+
+ATBWeekDay parseWeekDay(Configuration &cfg,
+                        rapidjson::GenericMemberIterator<false,
+                                                         rapidjson::UTF8<char>,
+                                                         rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>> k,
+                        QString const &innerObjName,
+                        Qt::DayOfWeek weekDay,
+                        QString const &weekDayName);
--- a/library/include/mobilisis/payment_opt.h
+++ b/library/include/mobilisis/payment_opt.h
@@ -38,8 +38,13 @@ public:
        pop_daily_card_price = -1;
        pop_business_hours = -1;
        pop_time_step_config = -1;
-        pop_use_only_upto_datetime = "";
-        pop_use_only_for_duration = 0;
+        pop_use_only_upto_datetime = ""; // deprecated
+        pop_use_only_for_duration = 0;   // deprecated
+        pop_plus_steps = 1;  // +: jump <x=1> steps forward
+        pop_plus_steps_saved = 1;
+        pop_minus_steps = 1; // -: jump <x=1> steps backward
+        pop_allow_overpay = false;
+        pop_apply_carry_over_to_ticket_endtime = false;
    }

    int pop_id;
@@ -69,6 +74,11 @@ public:
    int pop_time_step_config;
    bool pop_accumulate_prices;
    bool pop_accumulate_durations;
+    int pop_plus_steps;
+    int pop_plus_steps_saved;
+    int pop_minus_steps;
+    bool pop_allow_overpay;
+    bool pop_apply_carry_over_to_ticket_endtime;

    struct ATBMaxDateTime {
        int direction;
--- a/library/include/mobilisis/spec_days_worktime.h
+++ b/library/include/mobilisis/spec_days_worktime.h
@@ -8,5 +8,9 @@ public:
 	int pedwt_period_exc_day_id;
 	std::string pedwt_time_from;
 	std::string pedwt_time_to;
-	double pedwt_price;
-};
+    double pedwt_price;
+    int pedwt_paid; // 00: not paid (i.e. free)
+                    // 01: not paid in winter term, piad in summer term
+                    // 10: paid in winter term, not paid in summer term
+                    // 11: paid in winter and in summer term
+};
--- a/library/include/mobilisis/tariff_carryover.h
+++ b/library/include/mobilisis/tariff_carryover.h
@@ -15,6 +15,19 @@ struct ATBCarryOver {

    int id;

+    explicit ATBCarryOver()
+      : id(-1) {
+
+        for (int i = 0 ; i < 8; ++i) {
+            carryover[i].day = -1;
+            carryover[i].seemless = false;
+            carryover[i].never = false;
+            carryover[i].static_start = QTime(23, 59, 59);
+            carryover[i].static_end = QTime(0, 0, 0);
+            carryover[i].duration = -1;
+        }
+    }
+
    friend QDebug operator<<(QDebug debug, ATBCarryOver const &co) {
        QDebugStateSaver saver(debug);

@@ -31,21 +44,21 @@ struct ATBCarryOver {
            << "                day: " << co.carryover[(int)Qt::Tuesday].day << "\n"
            << "       static_start: " << co.carryover[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
            << "         static_end: " << co.carryover[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Tuesday].duration << "\n"
            << "            anytime: " << co.carryover[(int)Qt::Tuesday].seemless << "\n"
            << "              never: " << co.carryover[(int)Qt::Tuesday].never << "\n"
            << "        **** Wednesday **** \n"
            << "                day: " << co.carryover[(int)Qt::Wednesday].day << "\n"
            << "       static_start: " << co.carryover[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
            << "         static_end: " << co.carryover[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Wednesday].duration << "\n"
            << "            anytime: " << co.carryover[(int)Qt::Wednesday].seemless << "\n"
            << "              never: " << co.carryover[(int)Qt::Wednesday].never << "\n"
            << "        **** Thursday **** \n"
            << "                day: " << co.carryover[(int)Qt::Thursday].day << "\n"
            << "       static_start: " << co.carryover[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
            << "         static_end: " << co.carryover[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Thursday].duration << "\n"
            << "            anytime: " << co.carryover[(int)Qt::Thursday].seemless << "\n"
            << "              never: " << co.carryover[(int)Qt::Thursday].never << "\n"
            << "        **** Friday **** \n"
@@ -58,14 +71,14 @@ struct ATBCarryOver {
            << "                day: " << co.carryover[(int)Qt::Saturday].day << "\n"
            << "       static_start: " << co.carryover[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
            << "         static_end: " << co.carryover[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Saturday].duration << "\n"
            << "            anytime: " << co.carryover[(int)Qt::Saturday].seemless << "\n"
            << "              never: " << co.carryover[(int)Qt::Saturday].never << "\n"
            << "        **** Sunday **** \n"
            << "                day: " << co.carryover[(int)Qt::Sunday].day << "\n"
            << "       static_start: " << co.carryover[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
            << "         static_end: " << co.carryover[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Sunday].duration << "\n"
            << "            anytime: " << co.carryover[(int)Qt::Sunday].seemless << "\n"
            << "              never: " << co.carryover[(int)Qt::Sunday].never << "\n";

--- a/library/include/mobilisis/tariff_carryover_settings.h
+++ b/library/include/mobilisis/tariff_carryover_settings.h
@@ -0,0 +1,69 @@
+#ifndef ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
+#define ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
+
+#include <QDebug>
+#include <QDateTime>
+
+#include <functional>
+
+struct ATBTariffCarryOverSettings {
+
+    // parking time limit not violated: return false, otherwise: return true.
+    using ParkingTimeLimitChecker = std::function<bool(ATBTariffCarryOverSettings const&,
+                                                       QDateTime const &startTime,
+                                                       QDateTime const &endTime,
+                                                       int paymentOptionIndex)>;
+
+    int m_duration;
+    QTime m_start;
+    QTime m_end;
+    ParkingTimeLimitChecker m_parkingTimeLimitChecker;
+
+    QTime m_parking_time_limit;
+    QTime m_about_to_exceed_parking_time_limit;
+
+    explicit ATBTariffCarryOverSettings()
+      : m_duration(0)
+      , m_start(QTime())
+      , m_end(QTime())
+      , m_parkingTimeLimitChecker([](ATBTariffCarryOverSettings const&,
+                                  QDateTime const&, QDateTime const&, int) { return false; })
+      , m_parking_time_limit(QTime())
+      , m_about_to_exceed_parking_time_limit(QTime()) {}
+
+    explicit ATBTariffCarryOverSettings(int duration, QTime const &start,
+                                        QTime const &end,
+                                        QTime const &parking_time_limit,
+                                        QTime const &about_to_exceed_parking_time_limit,
+                                        ParkingTimeLimitChecker parkingTimeLimitChecker)
+      : m_duration(duration)
+      , m_start(start)
+      , m_end(end)
+      , m_parkingTimeLimitChecker(std::move(parkingTimeLimitChecker))
+      , m_parking_time_limit(parking_time_limit)
+      , m_about_to_exceed_parking_time_limit(about_to_exceed_parking_time_limit) {
+    }
+
+    bool parkingTimeLimitExceeded(QDateTime const &startTime,
+                                  QDateTime const &endTime,
+                                  int paymentOptionIndex) const {
+        return m_parkingTimeLimitChecker(*this, startTime, endTime, paymentOptionIndex);
+    }
+
+    QTime const &parkingTimeLimit() const { return m_parking_time_limit; }
+    QTime &parkingTimeLimit() { return m_parking_time_limit; }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffCarryOverSettings const &co) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 duration: " << co.m_duration << "\n"
+            << "                    start: " << co.m_start.toString(Qt::ISODate) << "\n"
+            << "                      end: " << co.m_end.toString(Qt::ISODate) << "\n"
+            << "       parking_time_limit: " << co.m_parking_time_limit.toString(Qt::ISODate) << endl;
+
+        return debug;
+    }
+};
+
+#endif // ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
--- a/library/include/mobilisis/tariff_log.h
+++ b/library/include/mobilisis/tariff_log.h
@@ -14,6 +14,8 @@
 void setDebugLevel(int level);
 int getDebugLevel();

+#if 0
+
 static void print() {
    std::cerr << "\n";
    if (getDebugLevel() == DBG_LEVEL_FATAL) {
@@ -75,4 +77,6 @@ static void LOG_FATAL(const Arg1& arg1, const Args&&... args) {
    }
 }

+#endif
+
 #endif //  TARIFF_LOG_INCLUDED_H
--- a/library/include/mobilisis/tariff_prepaid.h
+++ b/library/include/mobilisis/tariff_prepaid.h
@@ -5,13 +5,34 @@
 #include <QString>

 struct ATBPrepaid {
-    explicit ATBPrepaid() = default;
    int id;
    bool anytime;
    bool never;
    QTime static_start;
    QTime static_end;

+    struct week {
+        int day;
+        QTime static_start;
+        QTime static_end;
+        int duration;
+    } prepaid[8];
+
+    explicit ATBPrepaid()
+      : id(-1)
+      , anytime(false)
+      , never(false)
+      , static_start(QTime(23, 59, 59))
+      , static_end(QTime(0, 0, 0)) {
+
+        for (int i = 0 ; i < 8; ++i) {
+            prepaid[i].day = -1;
+            prepaid[i].static_start = QTime(23, 59, 59);
+            prepaid[i].static_end = QTime(0, 0, 0);
+            prepaid[i].duration = -1;
+        }
+    }
+
    friend QDebug operator<<(QDebug debug, ATBPrepaid const &pp) {
        QDebugStateSaver saver(debug);

@@ -20,7 +41,41 @@ struct ATBPrepaid {
            << "       static_start: " << pp.static_start.toString(Qt::ISODate) << "\n"
            << "         static_end: " << pp.static_end.toString(Qt::ISODate) << "\n"
            << "            anytime: " << pp.anytime << "\n"
-            << "              never: " << pp.never << "\n";
+            << "              never: " << pp.never << "\n"
+            << "        **** Monday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Monday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Monday].duration << "\n"
+            << "        **** Tuesday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Tuesday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Tuesday].duration << "\n"
+            << "        **** Wednesday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Wednesday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Wednesday].duration << "\n"
+            << "        **** Thursday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Thursday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Thursday].duration << "\n"
+            << "        **** Friday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Friday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Friday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Friday].static_end.toString(Qt::ISODate) << "\n"
+            << "        **** Saturday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Saturday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Saturday].duration << "\n"
+            << "        **** Sunday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Sunday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Sunday].duration << "\n";

        return debug;
    }
--- a/library/include/mobilisis/tariff_settings.h
+++ b/library/include/mobilisis/tariff_settings.h
@@ -0,0 +1,40 @@
+#ifndef ATB_TARIFF_SETTINGS_H_INCLUDED
+#define ATB_TARIFF_SETTINGS_H_INCLUDED
+
+#include <QDebug>
+
+struct ATBTariffSettings {
+    int m_max_price;
+    int m_min_price;
+    int m_max_time;
+    int m_min_time;
+
+    explicit ATBTariffSettings()
+      : m_max_price(0)
+      , m_min_price(0)
+      , m_max_time(0)
+      , m_min_time(0) {
+    }
+
+    explicit ATBTariffSettings(int max_price, int min_price, int max_time, int min_time)
+      : m_max_price(max_price)
+      , m_min_price(min_price)
+      , m_max_time(max_time)
+      , m_min_time(min_time) {
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffSettings const &ts) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                max_price: " << ts.m_max_price << "\n"
+            << "                min_price: " << ts.m_min_price << "\n"
+            << "                 max_time: " << ts.m_max_time << "\n"
+            << "                 min_time: " << ts.m_min_time << endl;
+
+        return debug;
+    }
+};
+
+
+#endif // ATB_TARIFF_SETTINGS_H_INCLUDED
--- a/library/include/mobilisis/utilities.h
+++ b/library/include/mobilisis/utilities.h
@@ -3,6 +3,7 @@
 #include <ctime>
 #include <iostream>
 #include <cmath>
+#include <optional>

 #include "day_of_week.h"
 #include "configuration.h"
@@ -62,6 +63,7 @@ namespace Utilities {
 	/// <returns></returns>
 	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
    bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
+    std::optional<ATBPeriodYear> GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);

 	/// <summary>
 	/// Check permissions
--- a/library/include/mobilisis/weekdays.h
+++ b/library/include/mobilisis/weekdays.h
@@ -1,10 +1,57 @@
-#pragma once
-#include <string>
+#include "tariff_settings.h"
+#include "tariff_carryover_settings.h"

-class ATBWeekDays
-{
-public:
-	int pdiw_id;
-	std::string pdiw_label;
-	int pdiw_index;
-};
+#include <QString>
+#include <Qt>
+#include <QDate>
+
+struct ATBWeekDay {
+    enum WeekDayType {USUAL_WEEKDAY=0, HOLIDAY=1};
+
+    Qt::DayOfWeek m_id;
+    QString m_name;
+    QDate m_date;
+    WeekDayType m_type;
+    ATBTariffSettings m_tariffSettings;
+    ATBTariffCarryOverSettings m_tariffCarryOverSettings;
+
+    explicit ATBWeekDay()
+        : m_id(Qt::Monday)
+        , m_name("")
+        , m_date(QDate())
+        , m_type(USUAL_WEEKDAY)
+        , m_tariffSettings()
+        , m_tariffCarryOverSettings() {}
+
+    explicit ATBWeekDay(Qt::DayOfWeek id, QString const &name, WeekDayType type,
+                        QDate const &date,
+                        ATBTariffSettings const &tariffSettings,
+                        ATBTariffCarryOverSettings const &tariffCarryOverSettings)
+        : m_id(id)
+        , m_name(name)
+        , m_date(date)
+        , m_type(type)
+        , m_tariffSettings(tariffSettings)
+        , m_tariffCarryOverSettings(tariffCarryOverSettings) {}
+
+    ATBTariffCarryOverSettings &getTariffCarryOverSettings() { return m_tariffCarryOverSettings; }
+    ATBTariffCarryOverSettings const &getTariffCarryOverSettings() const { return m_tariffCarryOverSettings; }
+
+    ATBTariffSettings &getTariffSettings() { return m_tariffSettings; }
+    ATBTariffSettings const &getTariffSettings() const { return m_tariffSettings; }
+
+    friend QDebug operator<<(QDebug debug, ATBWeekDay const &wd) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                       id: " << (int)wd.m_id << "\n"
+            << "                     name: " << wd.m_name << "\n"
+            << "                     type: " << (int)wd.m_type << "\n\n"
+            << "          tariff settings: " << "\n"
+                                             << wd.m_tariffSettings << "\n"
+            << "tariff carryover settings: " << "\n"
+                                             << wd.m_tariffCarryOverSettings << endl;
+
+        return debug;
+    }
+};
--- a/library/src/calculate_price.cpp
+++ b/library/src/calculate_price.cpp
@@ -3,6 +3,8 @@
 #include "calculator_functions.h"
 #include "payment_option.h"
 #include "utilities.h"
+#include "tariff_global_defines.h"
+#include "period_year.h"

 #include <QFile>
 #include <QFileInfo>
@@ -34,7 +36,10 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                  int paymentOptionIndex) {
    int minTime = 0;

-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    paymentOptionIndex = getPaymentOptionIndex(*cfg);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }

    qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
@@ -67,7 +72,10 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                  PERMIT_TYPE permitType,
                                                  int paymentOptionIndex) {

-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    paymentOptionIndex = getPaymentOptionIndex(*cfg);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }
    int maxTime = 0;

    switch(permitType) {
@@ -92,23 +100,61 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                   int paymentOptionIndex,
                                                   QDateTime const &start) {
    int minPrice = -1;
-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);

-    switch(permitType) {
-    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
-        minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_ADULT: {
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_TEEN: {
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_CHILD: {
-    } break;
-    case PERMIT_TYPE::DAY_TICKET: {
-        minPrice = compute_product_price(cfg, permitType, start);
-    } break;
-    default:
-        minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg, start)) == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }
+
+    int payment_method_id = cfg->getPaymentOptions(paymentOptionIndex).pop_payment_method_id;
+
+    if (payment_method_id == PaymentMethod::Degressive) {
+        // Degressive: new for Fuchs Technik (500), ValserAlm (Fane):
+        // the minimal price has to be calculated, in cannot be hard coded into
+        // the tariff file.
+        // The working times have a reference into the payment rates. Two special
+        // entries (with the numbers 1000/1001) point to the respective prices.
+        switch(permitType) {
+            default: {
+                // find the correct work time range
+                int weekDay = start.date().dayOfWeek();
+                std::optional<QVector<ATBWeekDaysWorktime>> const &wd = cfg->getAllWeekDayWorkTimes();
+                if (wd.has_value()) {
+                    QVector<ATBWeekDaysWorktime> const &vec = wd.value();
+                    for (int i = 0; i < vec.size(); ++i) {
+                        ATBWeekDaysWorktime const &wt = vec[i];
+                        if (wt.pwd_period_day_in_week_id == weekDay) {
+                            if (start.time() >= QTime::fromString(QString::fromStdString(wt.pwd_time_from), Qt::ISODate)
+                             && start.time() <= QTime::fromString(QString::fromStdString(wt.pwd_time_to), Qt::ISODate)) {
+                                // found worktime range
+                                int pop_id = wt.pwd_pop_id; // 1000 or 1001
+                                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                    i = vec.size(); // to leave outer loop
+                                    minPrice = itr->second.pra_price; // this is now the minimal price
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } else {
+        switch(permitType) {
+        case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+            minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+        } break;
+        case PERMIT_TYPE::DAY_TICKET_ADULT: {
+        } break;
+        case PERMIT_TYPE::DAY_TICKET_TEEN: {
+        } break;
+        case PERMIT_TYPE::DAY_TICKET_CHILD: {
+        } break;
+        case PERMIT_TYPE::DAY_TICKET: {
+            minPrice = compute_product_price(cfg, permitType, start);
+        } break;
+        default:
+            minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+        }
    }

    return minPrice;
@@ -211,8 +257,8 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,

            if (product.size() > 0) {
                if (productStart && productEnd) {
-                    int pop_min_time = get_minimal_parkingtime(cfg); // in minutes
-                    int pop_max_time = get_maximal_parkingtime(cfg); // in minutes
+                    int pop_min_time = get_minimal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
+                    int pop_max_time = get_maximal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
                    if (pop_max_time >= pop_min_time) {
                        *productStart = start;
                        *productEnd = start.addSecs(pop_max_time*60);
@@ -284,12 +330,16 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
    int maxPrice = -1;
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg)) == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }

    switch(permitType) {
    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
        if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
-            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+            //maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+            ATBPaymentOption const &po = cfg->getPaymentOptions(paymentOptionIndex);
+            maxPrice = po.pop_max_price; // maxTime is given in minutes
        } else { // PaymentMethod::Linear -> e.g. szeged
            int const key = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
            int const maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; // maxTime is given in minutes
@@ -315,10 +365,20 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
        break;
    case PERMIT_TYPE::DAY_TICKET_PKW:
        break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-        break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-        break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
+        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
+        if (po.has_value()) {
+            ATBPaymentOption option = po.value();
+            return option.pop_max_price;
+        }
+    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
+        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
+        if (po.has_value()) {
+            ATBPaymentOption option = po.value();
+            return option.pop_max_price;
+        }
+    } break;
    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
        break;
    default: ;
@@ -417,17 +477,27 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
                                                int UpDown, PermitType const &permitType)
 {

-    qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
-    qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+    qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
+    qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;

-    std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
-    if (!paymentOption.has_value()) {
-        return currentTimeMinutes;
+    // FIXME
+    //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
+    //if (!paymentOption.has_value()) {
+    //    qCritical() << "   compute_next_timestep() ERROR";
+    //    return currentTimeMinutes;
+    //}
+
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
    }

-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    qCritical() << "   compute_next_timestep()   payment option index: " << paymentOptionIndex;
+    int const &pop_plus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_plus_steps;
+    int const &pop_minus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_minus_steps;

+    qCritical() << __LINE__ << "compute_next_timestep()   payment option index: " << paymentOptionIndex;
+    qCritical() << __LINE__ << "compute_next_timestep()             plus steps: " << pop_plus_steps;
+    qCritical() << __LINE__ << "compute_next_timestep()            minus steps: " << pop_minus_steps;

    Configuration const *cfg = tariff;

@@ -435,19 +505,19 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
    PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
    switch (paymentMethodId) {
    case PaymentMethod::Progressive:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Progressive";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Progressive";
        break;
    case PaymentMethod::Degressive:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Degressive";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Degressive";
        break;
    case PaymentMethod::Linear:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Linear";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Linear";
        break;
    case PaymentMethod::Steps:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Steps";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Steps";
        break;
    case PaymentMethod::Undefined:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Undefined";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Undefined";
        break;
    }

@@ -455,61 +525,106 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
    if ((paymentMethodId == PaymentMethod::Steps) ||
        // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
-        (paymentMethodId == PaymentMethod::Progressive))
+        (paymentMethodId == PaymentMethod::Progressive) ||
+        // degressive tariff: e.g. Fuchs Technik (500)
+        (paymentMethodId == PaymentMethod::Degressive))
    {
-        // int paymentOptionIndex = 1;
-
        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+
        int const size = stepList.size();
        if (size == 0) {
            qCritical() << "compute_next_timestep() *ERROR empty step-list*";
            return  currentTimeMinutes;
        }

-        qCritical() << "   compute_next_timestep()      first time step:" << stepList[0];
-        qCritical() << "   compute_next_timestep()            timeSteps:" << stepList;
-        qCritical() << "   compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
+        qCritical() << __LINE__ << "compute_next_timestep()      first time step:" << stepList[0];
+        qCritical() << __LINE__ << "compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << __LINE__ << "compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;

        // consider time shift: the step-list might have been computed at a
        // slightly different time point
+
+        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+        if (currentStepIndex == -1) {
+            unsigned minimalDistance = ~0;
+            int j = -1;
+            for (int i = 0; i < stepList.size(); ++i) {
+                unsigned distance = std::abs(stepList[i] - currentTimeMinutes);
+                if (distance < minimalDistance) {
+                    minimalDistance = distance;
+                    j = i;
+                }
+            }
+            // max. tolerance set to 3 minutes
+            // unsigned const tolerance = std::min(minimalDistance, (unsigned)(3));
+            if (j != -1) {
+                stepList[j] = currentTimeMinutes;
+            }
+        }
+
+#if 0
        int maxStep = -1;
        if (size >= 2) {
            maxStep = stepList[1] - stepList[0];
        }
-        int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        // max. tolerance set to 5 minutes
+        int const tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
        for (int i=0; i < stepList.size(); ++i) {
            if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
                qCritical().noquote()
-                    << QString("   compute_next_timestep() correction stepList[%1]=%2 -> %3:")
+                    << __LINE__ << QString("compute_next_timestep() correction stepList[%1]=%2 -> %3:")
                                    .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
                stepList[i] = currentTimeMinutes;
-                qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
+                qCritical() << __LINE__ << "compute_next_timestep()        NEW timeSteps:" << stepList;
            }
        }

        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+#endif
+
+        currentStepIndex = stepList.indexOf(currentTimeMinutes);
+        qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";

        if (currentStepIndex == -1) {
-            qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+            qCritical() << __LINE__ << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
            return  currentTimeMinutes;
        }

        if (UpDown == 1) { // UP
            if (stepList[currentStepIndex] == stepList.last()) {
-                qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << __LINE__ << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                return  currentTimeMinutes;
            }
            else {
-                return stepList[currentStepIndex + 1];
+                int const rest = currentStepIndex % pop_plus_steps;
+
+                if (rest) {
+                    currentStepIndex -= rest;
+                }
+
+                qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
+
+                int const nextStepIndex = currentStepIndex + pop_plus_steps;
+
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
            }
        }
        if (UpDown == 0) { // DOWN
            if (stepList[currentStepIndex] == stepList.first()) {
-                qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << __LINE__ << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                return  currentTimeMinutes;
            }
            else {
-                return stepList[currentStepIndex - 1];
+                int const nextStepIndex = currentStepIndex - pop_minus_steps;
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
            }
        }
    } else
@@ -553,9 +668,19 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        time_t end_parking_time,    // netto time in minutes
        struct price_t *price,
        PermitType permitType) {    // permitType maps to product
+
    CalcState calcState;

-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    QDateTime end(start);
+
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
+    }

    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_time;
    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_max_time;
@@ -583,11 +708,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        return calcState.set(CalcState::State::SUCCESS);
    }

-    QDate const d(1970, 1, 1);
-    QTime const t(0, 0, 0);
-    QDateTime start(d, t, Qt::UTC);
-    start = start.toLocalTime().addSecs(start_parking_time * 60);
-    QDateTime end(start);
+    //QDate const d(1970, 1, 1);
+    //QTime const t(0, 0, 0);
+    //QDateTime start(d, t, Qt::UTC);
+    //start = start.toLocalTime().addSecs(start_parking_time * 60);
+    //QDateTime end(start);
    if (start.isValid()) {
        double cost = Calculator::GetInstance().GetCostFromDuration(
                    tariff,
@@ -611,7 +736,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        parking_tariff_t *tariff,
-        QDateTime &start_parking_time,
+        QDateTime &start_parking_time_,
        int netto_parking_time,
        QDateTime &end_parking_time,
        struct price_t *price,
@@ -620,7 +745,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 {
    CalcState calcState;

-    int paymentOptionIndex = tariff->getPaymentOptionIndex(start_parking_time);
+    QDateTime start_parking_time(start_parking_time_);
+
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    }

    double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
    double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
@@ -632,8 +762,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                << "          netto_parking_time: " << netto_parking_time << endl
                << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
                << "                      minMin: " << minMin << endl
-                << "                      maxMin: " << maxMin;
-
+                << "                      maxMin: " << maxMin
+                << "                     prepaid: " << prepaid
+                << "                  permitType: " << permitType.toString();

    if (netto_parking_time < 0) {
        calcState.setDesc(QString("end=%1, start=%2")
@@ -655,38 +786,161 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

    double cost = -1;
    if (start_parking_time.isValid()) {
-
-        // qCritical() << __func__ << __LINE__;
-
        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps ||
            tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Degressive) {
-        // qCritical() << __func__ << __LINE__;
            // hier muesste man unterscheiden: uebertrag oder nicht?
            calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
                                                                   netto_parking_time, paymentOptionIndex);
            if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
-                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                             << calcState.toString();
-        // qCritical() << __func__ << __LINE__;
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << calcState.toString();
                return calcState;
            }
-        // qCritical() << __func__ << __LINE__;

-            QList<int> lll = Calculator::GetInstance().GetTimeSteps(tariff);
+            QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff);
+            Q_UNUSED(tlist);

-            // netto_parking_time = compute_next_timestep(tariff, netto_parking_time, 1, permitType);
-
-            qCritical() << "LINE" << __LINE__ << "netto" << netto_parking_time << lll;
-
-        // qCritical() << __func__ << __LINE__;
+            // compute cost (price)
            cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
-            end_parking_time = start_parking_time.addSecs(netto_parking_time*60);

-            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-            //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+            int weekDay = start_parking_time.date().dayOfWeek();
+            int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+            int pop_prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;

+            std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
+            int period_id = -1;
+            if (yperiod.has_value()) {
+                ATBPeriodYear const &period = yperiod.value();
+                period_id = period.pye_id;
+                pop_carry_over_option_id = period.pye_id;
+                pop_prepaid_option_id = period.pye_id;
+                qCritical() << __func__ << ":" << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
+                qCritical() << __func__ << ":" << __LINE__ << "   re-computed prepaid-id" << pop_prepaid_option_id;
+            }
+
+            QDateTime effectiveStartTime(start_parking_time);
+
+            // handle special days
+            int const specialDayId = tariff->specialDayId(start_parking_time);
+            if (specialDayId > 0) { // found special day
+                for (auto[itr, rangeEnd] = tariff->SpecialDaysWorktime.equal_range(specialDayId); itr != rangeEnd; ++itr) {
+                    ATBSpecialDaysWorktime const &wt = itr->second;
+                    switch(period_id) {
+                    case 1: // summer term
+                        if ((wt.pedwt_paid & 1) == 0) {
+                            // does not have to be paid, move to next midnight
+
+                            // better: start of next day (falls kein vorkauf besteht)
+                            effectiveStartTime = effectiveStartTime.addDays(1);
+                            effectiveStartTime.setTime(QTime(0, 0, 0));
+                        }
+                        break;
+                    case 2: // winter term
+                        if ((wt.pedwt_paid & 2) == 0) {
+                            // does not have to be paid, move to next midnight
+
+                            // better: start of next day (falls kein vorkauf besteht)
+                            effectiveStartTime = effectiveStartTime.addDays(1);
+                            effectiveStartTime.setTime(QTime(0, 0, 0));
+                        }
+                        break;
+                    default:;
+                    }
+                }
+            }
+
+            // handle prepaid option
+            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
+            if (prepaidOption.has_value()) {
+                ATBPrepaid const &p = prepaidOption.value();
+                if (p.never) {
+                    qCritical() << __func__ << ":" << __LINE__ << "prepaid: no";
+                } else {
+                    qCritical() << __func__ << ":" << __LINE__ << "    prepaidStart" << p.prepaid[weekDay].static_start.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "      prepaidEnd" << p.prepaid[weekDay].static_end.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "prepaid duration" << p.prepaid[weekDay].duration;
+
+                    if (start_parking_time.time() < p.prepaid[weekDay].static_end) {     // static_end: e.g. 08:00:00
+                        effectiveStartTime.setTime(p.prepaid[weekDay].static_end);
+                    } else
+                    if (start_parking_time.time() > p.prepaid[weekDay].static_start) {   // static_start: e.g. 22:00:00
+                        effectiveStartTime.setTime(p.prepaid[weekDay].static_start);
+                    }
+                }
+            }
+
+            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:" << effectiveStartTime.toString(Qt::ISODate);
+
+            int const carryOver = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over;
+
+            qCritical() << __func__ << ":" << __LINE__ << "   carryOver flag" << carryOver;
+
+            if (carryOver == 1) {
+                QTime carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+                int carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+                qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+
+                // handle carry over
+                int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
+                if (netto_parking_time > minutesUntilCarryOver) {
+                    int const rest = netto_parking_time - minutesUntilCarryOver;
+                    QDateTime s(effectiveStartTime);
+                    s = s.addSecs(minutesUntilCarryOver * 60);
+                    s = s.addSecs(carryOverDuration * 60);
+                    end_parking_time = s.addSecs(rest * 60);
+                } else {
+                    end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
+                }
+
+                qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+
+                weekDay = end_parking_time.date().dayOfWeek();
+
+                // musste man in einer schleife machen
+                carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+                carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+                if (end_parking_time.time() > carryOverStart) {
+                    end_parking_time = end_parking_time.addSecs(carryOverDuration * 60);
+                } else
+                if (end_parking_time.time() == carryOverStart) {
+                    qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                    ATBPaymentOption const &po = tariff->getPaymentOptions(paymentOptionIndex);
+                    if (po.pop_apply_carry_over_to_ticket_endtime) {
+                        end_parking_time = end_parking_time.addSecs(carryOverDuration * 60);
+                        qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    }
+                }
+            } else {
+                qCritical() << __func__ << ":" << __LINE__ << "NO carryOver configured";
+                end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
+            }
+
+            end_parking_time.setTime(QTime(end_parking_time.time().hour(),
+                                           end_parking_time.time().minute(), 0));
+
+            qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+            qCritical() << __func__ << ":" << __LINE__ << "        week-day:" << weekDay;
+
+            for (auto[itr, rangeEnd] = tariff->WeekDays.equal_range((Qt::DayOfWeek)weekDay); itr != rangeEnd; ++itr) {
+                ATBWeekDay const &wd = itr->second;
+                bool const parkTimeLimitViolated = wd.getTariffCarryOverSettings().parkingTimeLimitExceeded(effectiveStartTime,
+                                                                                                            end_parking_time,
+                                                                                                            paymentOptionIndex);
+                if (parkTimeLimitViolated) {
+                    //QTime const &tlimit = wd.getTariffCarryOverSettings().parkingTimeLimit();
+                    //end_parking_time.setTime(tlimit);
+
+                    calcState.setDesc(QString("line=%1 endTime=%2: park-time-limit violated").arg(__LINE__)
+                                        .arg(end_parking_time.time().toString(Qt::ISODate)));
+                    return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+                }
+            }
        } else {
-        // qCritical() << __func__ << __LINE__;
            cost = Calculator::GetInstance().GetCostFromDuration(
                        tariff,
                        tariff->getPaymentOptions().pop_payment_method_id,
@@ -703,8 +957,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        }

        // DEBUG
-        qCritical() << "            end_parking_time: " << end_parking_time;
-        qCritical() << "  -> calculated cost (netto): " << cost;
+        //qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
+        //qCritical() << __LINE__ << "  -> calculated cost (netto): " << cost;

        price->brutto = price->vat = price->vat_percentage = 0;
        price->units = cost;
@@ -714,6 +968,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        return calcState.set(CalcState::State::INVALID_START_DATE);
    }

+    if (end_parking_time.time().hour() == 0 && end_parking_time.time().minute() == 0) {
+        end_parking_time = end_parking_time.addDays(-1);
+        end_parking_time.setTime(QTime(23, 59, 0));
+    }
+    qCritical() << __func__ << __LINE__ << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+
    return calcState.set(CalcState::State::SUCCESS);
 }

@@ -731,15 +991,34 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    if (start.isValid()) {
        QString cs = start.toString(Qt::ISODate);

-        // DEBUG
-        qCritical() << "compute_duration_for_parking_ticket(): ";
-        qCritical() << "      start (cs): " << cs;
-        qCritical() << "           price: " << price;
+        bool prepaid = true;
+        int paymentOptionIndex = getPaymentOptionIndex(*tariff, start);
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        if (paymentOptionIndex == -1) {
+            paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+        }
+
+        int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+        if (prepaid_option_id == 2) { // see tariff03.json for 502: 2 means no prepaid-option
+            prepaid = false;
+        }
+        bool const nextDay = false;
+
+        // DEBUG
+        qCritical() << "compute_duration_for_parking_ticket(1): ";
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "           start (cs): " << cs;
+        qCritical() << "                price: " << price;
+
+        std::pair<std::string, QDateTime> p_duration
+                = Calculator::GetInstance().GetDurationFromCost(tariff,
+                    tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
+                                              cs.toLocal8Bit().constData(),
+                                              price, permitType, nextDay, prepaid);
+        duration = p_duration.first.c_str();
+

-        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
-                                                  tariff->getPaymentOptions().pop_payment_method_id,
-                                                  cs.toLocal8Bit().constData(),
-                                                  price, false, true).c_str();
        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
        if (!d.isValid()) {
            calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -760,13 +1039,66 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        PermitType permitType)
 {
    CalcState calcState;
+
+    bool prepaid = true;
+
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
+    qCritical() << __func__ << ":" << __LINE__ << "payment option index: " << paymentOptionIndex;
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    }
+
+    qCritical() << __func__ << ":" << __LINE__ << " payment option index: " << paymentOptionIndex;
+
+    int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+
+    if (prepaid_option_id == 2) {
+        prepaid = false;
+    }
+    bool const nextDay = false;
+
+    // DEBUG
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "compute_duration_for_parking_ticket(2): ";
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "                price: " << price;
+    }
+
    if (start_parking_time.isValid()) {
+
+        int const pop_time_step_config = tariff->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
+        if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
+            // handle prepaid option
+            QDateTime effectiveStartTime(start_parking_time);
+            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
+            if (prepaidOption.has_value()) {
+                ATBPrepaid const &p = prepaidOption.value();
+                if (p.never) {
+                    qCritical() << __func__ << __LINE__ << "prepaid: no";
+                } else {
+                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
+                        effectiveStartTime.setTime(p.static_end);
+                    } else
+                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
+                        effectiveStartTime.setTime(p.static_start);
+                    }
+                }
+            }
+        }
+
        QString cs = start_parking_time.toString(Qt::ISODate);
-        QString endTime = Calculator::GetInstance().GetDurationFromCost(
+
+        std::pair<std::string, QDateTime> p_endTime
+                = Calculator::GetInstance().GetDurationFromCost(
                    tariff,
                    tariff->getPaymentOptions().pop_payment_method_id,
                    cs.toLocal8Bit().constData(),
-                    price, false, true).c_str();
+                    price, permitType, nextDay, prepaid);
+
+        QString endTime = p_endTime.first.c_str();
+        ticketEndTime = p_endTime.second;

        if (endTime == CalcState::SUCCESS) {
            calcState.setDesc(QString("SUCCESS"));
@@ -828,15 +1160,96 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        } else {
            ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);

-            // DEBUG
-            //qCritical() << "compute_duration_for_parking_ticket(): ";
-            //qCritical() << "                 endTime: " << endTime;
-            //qCritical() << "           ticketEndTime: " << ticketEndTime;
+            qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+            qCritical() << __func__ << ":" << __LINE__ << "step-config:" << pop_time_step_config;

            if (!ticketEndTime.isValid()) {
                calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
                return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
            }
+
+            if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
+                // handle carry over for ticket-end-time
+                qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+
+                int weekDay = start_parking_time.date().dayOfWeek();
+                int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+                qCritical() << __func__ << ":" << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;
+
+                std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
+                if (yperiod.has_value()) {
+                    ATBPeriodYear const &period = yperiod.value();
+                    pop_carry_over_option_id = period.pye_id;
+                    qCritical() << __func__ << ":" << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
+                }
+
+                QTime carryOverStart;
+                QTime carryOverEnd;
+                int carryOverDuration = -1;
+
+                // using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+                std::multimap<int, ATBCarryOver>::const_iterator it;
+                if ((it = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)) !=
+                    tariff->TariffCarryOverOptions.cend()) {
+                    carryOverStart = it->second.carryover[weekDay].static_start;
+                    carryOverEnd = it->second.carryover[weekDay].static_end;
+                    carryOverDuration = it->second.carryover[weekDay].duration;
+                }
+
+                if (carryOverStart.isValid() && carryOverEnd.isValid()) {
+                    qCritical() << __func__ << ":" << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "carryOverEnd" << carryOverEnd.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+                }
+
+                if (carryOverStart.isValid() && carryOverEnd.isValid() && carryOverDuration != -1) {
+                    // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                    if (ticketEndTime.time() > carryOverStart) {
+                        // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                    } else {
+                        // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        if (ticketEndTime.time() < carryOverEnd) {
+                            // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                            ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                        }
+                    }
+                } else {
+                    qCritical() << __func__ << ":" << __LINE__ << "WARNING: wrong carry-over-settings";
+                }
+            }
+
+
+            ticketEndTime.setTime(QTime(ticketEndTime.time().hour(),
+                                        ticketEndTime.time().minute(), 0));
+
+            qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+
+            for (auto[itr, rangeEnd] = tariff->WeekDays.equal_range((Qt::DayOfWeek)(ticketEndTime.date().dayOfWeek()));
+                 itr != rangeEnd;
+                 ++itr) {
+                ATBWeekDay const &wd = itr->second;
+                bool const parkTimeLimitViolated = wd.getTariffCarryOverSettings().parkingTimeLimitExceeded(start_parking_time,
+                                                                                                            ticketEndTime,
+                                                                                                            paymentOptionIndex);
+                if (parkTimeLimitViolated) {
+                    //QTime const &tlimit = wd.getTariffCarryOverSettings().parkingTimeLimit();
+                    //ticketEndTime.setTime(tlimit);
+
+                    calcState.setDesc(QString("line=%1 endTime=%2: park-time-limit violated").arg(__LINE__)
+                                      .arg(ticketEndTime.time().toString(Qt::ISODate)));
+                    return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+                }
+            }
+
+            if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
+                ticketEndTime = ticketEndTime.addDays(-1);
+                ticketEndTime.setTime(QTime(23, 59, 0));
+            }
+
+            // DEBUG
+            qCritical() << __func__ << ":" << __LINE__ << "      endTime:" << endTime;
+            qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
        }
    } else {
        return calcState.set(CalcState::State::INVALID_START_DATE);
@@ -848,7 +1261,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff,
                                                                  QDateTime const &start_parking_time,
                                                                  QDateTime &ticketEndTime,
-                                                                  PermitType PermitType)
+                                                                  PermitType /* PermitType */)
 {
    CalcState calcState;
    if (start_parking_time.isValid()) {
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
@@ -118,56 +118,174 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
    return QDateTime();
 }
 /// <inheritdoc/>
-std::string Calculator::GetDurationFromCost(Configuration* cfg,
-                                            uint8_t payment_option,
-                                            char const *startDatetimePassed, // given in local time
-                                            double cost,
-                                            PermitType permitType,
-                                            bool nextDay,
-                                            bool prepaid)
+std::pair<std::string, QDateTime>
+Calculator::GetDurationFromCost(Configuration* cfg,
+                                uint8_t payment_option,
+                                char const *startDatetimePassed, // given in local time
+                                double cost,
+                                PermitType /*permitType*/,
+                                bool nextDay,
+                                bool prepaid)
 {
    Q_UNUSED(payment_option);
    Q_UNUSED(nextDay);

    // Get input date
-    QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
+    QDateTime inputDate = QDateTime::fromString(startDatetimePassed, Qt::ISODate);
+    inputDate.setTime(QTime(inputDate.time().hour(), inputDate.time().minute(), 0));
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

-    //qCritical() << DBG_HEADER << "          start" << inputDate.toString(Qt::ISODate);
-    //qCritical() << DBG_HEADER << "paymentMethodId" << static_cast<int>(paymentMethodId);
+    bool overPaid = false;

-    Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate);
+    int paymentOptionIndex = getPaymentOptionIndex(*cfg, inputDate);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(QDateTime::fromString(startDatetimePassed, Qt::ISODate));
+    }

+    qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "          start:" << inputDate.toString(Qt::ISODate);
+        qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
+        qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
+        qCritical() << DBG_HEADER << "        prepaid:" << prepaid;
+        qCritical() << DBG_HEADER << "   cost (price):" << cost;
+    }
+
+    QList<int> tsteps = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, inputDate);
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "     time steps:" << tsteps;
+    } else {
+        Q_UNUSED(tsteps);
+    }
+
+    if (paymentMethodId == PaymentMethod::Degressive) {
+
+        if (static_cast<int>(cost) < cfg->getPaymentOptions(paymentOptionIndex).pop_min_price) {
+            // minimal price is set by GetTimeSteps()
+            qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
+            qCritical() << DBG_HEADER << "configured minimal price:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+            return std::make_pair(CalcState::BELOW_MIN_PARKING_PRICE.toStdString(), QDateTime());
+        }
+
+        if (prepaid == false) {
+            int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+            int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
+            int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
+
+            // qCritical() << DBG_HEADER << "   pop id:" << pop_id;
+
+            int price = 0;
+            int new_price = 0;
+            int durationInMinutes = 0;
+            uint32_t duration_previous = 0;
+            // bool found = false;
+
+            for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                int const pra_price = itr->second.pra_price;
+                int const durationId = itr->second.pra_payment_unit_id;
+                if (pop_accumulate_prices) {
+                    price += pra_price;
+                } else {
+                    price = pra_price;
+                }
+
+                // qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
+                // qCritical() << DBG_HEADER << "  duration id" << durationId;
+
+                auto search = cfg->Duration.find(durationId);
+                if (search != cfg->Duration.end()) {
+                    // found now the duration in minutes
+                    // check if we are still inside the working-time-range
+                    ATBDuration duration = search->second;
+
+                    if (pop_accumulate_prices) {
+                        uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+
+                        new_price += pra_price;
+                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")  old price" << price << ", new_price:" << new_price;
+                        if (new_price <= cost) {
+                            duration_previous = durationUnit;
+                            if (pop_accumulate_durations) {
+                                durationInMinutes += durationUnit;
+                            }
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  old price" << price << ", new_price:" << new_price;
+                        } else {
+                            //found = true;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
+                            QDateTime d;
+                            if (pop_accumulate_durations) {
+                                d = inputDate.addSecs(durationInMinutes * 60);
+                            } else {
+                                d = inputDate.addSecs(duration_previous * 60);
+                            }
+
+                            qCritical() << DBG_HEADER << "                    provided price (cost):" << cost;
+                            qCritical() << DBG_HEADER << "        computed time for price (minutes):" << duration_previous;
+                            qCritical() << DBG_HEADER << "           minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+
+                            if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
+                                return std::make_pair(CalcState::BELOW_MIN_PARKING_TIME.toStdString(), d); // minimal parking time is set by GetTimeSteps()
+                            }
+                            return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
+                        }
+                    }
+
+                    if ((double)price == cost) {
+                        QDateTime d(inputDate.addSecs(durationInMinutes * 60));
+
+                        QString const durationStr(d.toString(Qt::ISODate));
+
+                        qCritical() << DBG_HEADER << "     duration in minutes:" << durationInMinutes;
+                        qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
+                        qCritical() << DBG_HEADER << "      duration for price:" << durationStr;
+
+                        return std::make_pair(durationStr.toStdString(), d);
+                    }
+                }
+            }
+
+        } else {
+            qCritical() << DBG_HEADER << "   TODO";
+        }
+    } else
    if (paymentMethodId == PaymentMethod::Steps) {
        if (tariffIs24_7(cfg)) {
            // use tariff with structure as for instance Schoenau, Koenigsee:
            // without given YearPeriod, SpecialDays and SpecialDaysWorktime
            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
-            return inputDate.toString(Qt::ISODate).toStdString();
+            return std::make_pair(inputDate.toString(Qt::ISODate).toStdString(), inputDate);
        } else {
            if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
                if (!prepaid) {
                    CalcState cs = isParkingAllowed(cfg, inputDate);
                    if (cs) {
                        inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
-                        return inputDate.toString(Qt::ISODate).toStdString();
+                        return std::make_pair(inputDate.toString(Qt::ISODate).toStdString(), inputDate);
                    }
                }

-                // TODO: man braucht den richtigen Index
-                int paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
                int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
                int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
                int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+                int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;

                if (cost > pop_max_price) {
                    qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
-                    return CalcState::OVERPAID.toStdString();
+                    if (pop_allow_overpay == false) {
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), QDateTime());
+                    }
+                    cost = pop_max_price;
+                    overPaid = true;
+                    // return CalcState::OVERPAID.toStdString();
                }

                if (cost < pop_min_price) {
                    qCritical() << DBG_HEADER << "MIN-PARKING-PRICE" << pop_min_price << ", COST" << cost;
-                    return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
+                    return std::make_pair(CalcState::BELOW_MIN_PARKING_PRICE.toStdString(), QDateTime());
                }

                // int const pop_pre_paid = 1;
@@ -180,7 +298,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    // in this case, adapt inputDate accordingly.


-// #define DEBUG_GET_DURATION_FROM_COST 1
+#define DEBUG_GET_DURATION_FROM_COST 0
 #if DEBUG_GET_DURATION_FROM_COST==1
                    qCritical() << DBG_HEADER << "PRE-PAID-OPTION: ADAPT-INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
@@ -194,6 +312,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                        QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                        QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);

+                        //qCritical() << DBG_HEADER << "from" << pwd_time_from.toString(Qt::ISODate);
+                        //qCritical() << DBG_HEADER << "  to" << pwd_time_to.toString(Qt::ISODate);
+
                        if (inputDate.time() < pwd_time_from) {
                            inputDate.setTime(pwd_time_from);
                            useWeekDaysWorkTimeOfOtherDay = false;
@@ -230,28 +351,39 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            }
                        }
                    }
+                } else {
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << "no prepaid";
                }

 #if DEBUG_GET_DURATION_FROM_COST==1
                qCritical() << DBG_HEADER << "(ADAPTED) INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
+                //qCritical() << __func__ << __LINE__;

                // inputDate is now located in a valid operational-working-range
                // find this working-time-range
                int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
+                //qCritical() << __func__ << __LINE__ << pwd_period_day_in_week_id;
+                //qCritical() << __func__ << __LINE__ << cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id);
+
                if (cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id) == 0) {
                    qCritical() << DBG_HEADER
                                << "ERROR" << inputDate.toString(Qt::ISODate)
                                << "NOT IN VALID WORKING TIME-RANGE";
-                    return "";
+                    return std::make_pair("", QDateTime());
                }

+                //qCritical() << __func__ << __LINE__;
+
                QTime current_working_time_from;
                QTime current_working_time_to;

                for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_day_in_week_id); iter != rEnd; ++iter) {
                    QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                    QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
+                //qCritical() << __func__ << pwd_time_from.toString(Qt::ISODate);
+                //qCritical() << __func__ << pwd_time_to.toString(Qt::ISODate);
+                //qCritical() << __func__ << inputDate.toString(Qt::ISODate);
                    if (pwd_time_from <= inputDate.time() && inputDate.time() <= pwd_time_to) {
                        current_working_time_from = pwd_time_from;
                        current_working_time_to = pwd_time_to;
@@ -263,7 +395,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    qCritical() << DBG_HEADER
                                << "ERROR" << inputDate.toString(Qt::ISODate)
                                << "NOT IN VALID WORKING TIME-RANGE";
-                    return "";
+                    return std::make_pair("", QDateTime());
                }

 #if DEBUG_GET_DURATION_FROM_COST==1
@@ -271,11 +403,14 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                qCritical() << DBG_HEADER << "  CURRENT WORKING-TIME-TO" << current_working_time_to.toString(Qt::ISODate);
 #endif

-
                int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
                // int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
                int price = 0;
+                int new_price = 0;
                int durationInSecs = 0;
+                uint32_t duration_previous = 0;
+                // bool found = false;
+
                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                    int const pra_price = itr->second.pra_price;
                    int const durationId = itr->second.pra_payment_unit_id;
@@ -285,18 +420,40 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                        price = pra_price;
                    }

-                    //qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
+                    // qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;

                    auto search = cfg->Duration.find(durationId);
                    if (search != cfg->Duration.end()) {
                        // found now the duration in minutes
                        // check if we are still inside the working-time-range
                        ATBDuration duration = search->second;
-                        //if (pop_accumulate_durations) {
-                        //    durationInSecs += duration.pun_duration * 60;
-                        //} else {
-                            durationInSecs = duration.pun_duration * 60;
-                        //}
+
+                        if (pop_accumulate_prices) {
+                            uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+
+                            new_price += pra_price;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX    price:" << price;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  YYYYYY    new_price:" << new_price;
+                            if (new_price <= cost) {
+                               duration_previous = durationUnit;
+                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") ZZZZZZ duration_previous" << duration_previous;
+                            } else {
+                               //found = true;
+                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") WWWWWW duration_previous" << duration_previous;
+                                QString s = inputDate.toString(Qt::ISODate);
+                                QDateTime d(QDateTime::fromString(s, Qt::ISODate));
+                                d = d.addSecs(duration_previous * 60);
+                                //qCritical() << DBG_HEADER << "XXXXXXXXXXXXXXXXXXXXX" << d;
+                                if (overPaid) {
+                                    return std::make_pair(CalcState::OVERPAID.toStdString(), d);
+                                }
+                                return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
+                            }
+                        } else {
+                            durationInSecs = cfg->Duration.find(durationId)->second.pun_duration * 60;
+                            //qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
+                            //qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
+                        }

                        if ((double)price == cost) {
                            QDateTime current_working_date_time_to = inputDate;
@@ -343,17 +500,30 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                                    QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                                                    if (next_working_time_from < pwd_time_from) {
                                                        next_working_time_from = pwd_time_from;
+                                                        qCritical() << DBG_HEADER << "next working time from" << next_working_time_from.toString(Qt::ISODate);
                                                        break;
                                                    }
                                                }

+                                                //qCritical() << DBG_HEADER << "DAYS" << days;
+                                                //qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
+                                                //qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
+
                                                QDateTime upper = inputDate.addDays(days);
                                                upper.setTime(next_working_time_from);

+                                                //qCritical() << DBG_HEADER << "UPPER" << upper.toString(Qt::ISODate);
+
                                                QDateTime lower = inputDate;
                                                lower.setTime(current_working_time_to);

-                                                inputDate = inputDate.addSecs(lower.secsTo(upper) + durationInSecs);
+                                                //qCritical() << DBG_HEADER << "LOWER" << lower.toString(Qt::ISODate);
+
+                                                // inputDate = inputDate.addSecs(lower.secsTo(upper));
+
+                                                //qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);
+
+                                                inputDate = inputDate.addSecs(durationInSecs);
 #if DEBUG_GET_DURATION_FROM_COST==1
                                                qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
 #endif
@@ -388,12 +558,20 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            qCritical() << DBG_HEADER << "TICKET-END" << s;
 #endif

-                            return s.toStdString();
+                            if (overPaid) {
+                                return std::make_pair(CalcState::OVERPAID.toStdString(), inputDate);
+                            }
+                            return std::make_pair(s.toStdString(), inputDate);
                        } // if ((double)price == cost) {
+                        else {
+                            //qCritical() << DBG_HEADER;
+                        }
+                    } else {
+                        //qCritical() << __func__ << __LINE__;
                    }
                }

-                return "";
+                return std::make_pair("", QDateTime());
            }
        }
    } else
@@ -410,7 +588,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,

        if (cost < minParkingPrice) {
            qCritical() << QString("ERROR: COST < MIN_PARKING_PRICE (%1 < %2)").arg(cost).arg(minParkingPrice);
-            return QDateTime().toString(Qt::ISODate).toStdString();
+            return std::make_pair(QDateTime().toString(Qt::ISODate).toStdString(), QDateTime());
        }

        if (cost > maxParkingPrice) {
@@ -449,7 +627,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                weekdayId = current.date().dayOfWeek();
                if (weekdayId == weekdayIdLast) {
                    qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
-                    return QDateTime().toString(Qt::ISODate).toStdString();
+                    return std::make_pair(QDateTime().toString(Qt::ISODate).toStdString(), QDateTime());
                }
            }

@@ -467,7 +645,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,

            if (current.time() >= to) {
                if (carryOverNotSet) {
-                    return end_datetime.toString(Qt::ISODate).toStdString();
+                    if (overPaid) {
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                    }
+                    return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                } else {
                    QDateTime const dt = start;
                    start = start.addDays(1);
@@ -514,7 +695,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                << "price" << price;
 #endif
                    end_datetime = current;
-                    return end_datetime.toString(Qt::ISODate).toStdString();
+                    if (overPaid) {
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                    }
+                    return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                }

                QTime const &from = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_from.c_str(), Qt::ISODate);
@@ -609,7 +793,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                    << "price" << price;
 #endif
-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                        if (overPaid) {
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                    }
                }

@@ -650,7 +837,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                    << "price" << price;
 #endif
-                                return end_datetime.toString(Qt::ISODate).toStdString();
+                                if (overPaid) {
+                                    return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                                }
+                                return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                            }

                            // price has been updated; use next time range
@@ -681,7 +871,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "price" << price;
 #endif

-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                        if (overPaid) {
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                    }

                    if (moveToNextTimeRange) {
@@ -797,8 +990,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                    << "price" << price;
 #endif
-
-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                        if (overPaid) {
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                    }
                }

@@ -811,7 +1006,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            << "final price" << std::max(price, minParkingPrice);
 #endif

-                return end_datetime.toString(Qt::ISODate).toStdString();
+                if (overPaid) {
+                    return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                }
+                return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
            } // while (timeRangeIt != cfg->TimeRange.cend()) {
        }

@@ -820,7 +1018,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            << "INVALID END TIME";
 #endif
        end_datetime = QDateTime();
-        return end_datetime.toString(Qt::ISODate).toStdString();
+        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
    }

    Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);
@@ -828,7 +1026,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
    // qCritical().noquote() << t;

    // TODO: im fehlerfall
-    return t.getValidUntil().toString(Qt::ISODate).toStdString();
+    return std::make_pair(t.getValidUntil().toString(Qt::ISODate).toStdString(), t.getValidUntil());
 }
 #undef _DEBUG_

@@ -843,7 +1041,7 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
                                         int paymentOptionIndex) const {
    // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
    // special days, nonstop.
-    qCritical() << __func__ << __LINE__;
+    //qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;

    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
    if (paymentMethodId == PaymentMethod::Steps ||
@@ -860,12 +1058,13 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                         int paymentOptionIndex) const {
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

-    qCritical() << __func__ << __LINE__;
+    //qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;

    if (paymentMethodId == PaymentMethod::Steps ||
        paymentMethodId == PaymentMethod::Degressive) {
        int const timeStepInMinutes = start.secsTo(end) / 60;
-
+        QList<int> tlist = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, start);
+        qCritical() << DBG_HEADER << "timeStepList" << timeStepInMinutes << tlist;
        qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);

        return GetPriceForTimeStep(cfg, timeStepInMinutes, paymentOptionIndex);
@@ -878,8 +1077,8 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                                                 int netto_parking_time,
                                                 int paymentOptionIndex) {

-    qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
-                << "paymentOptionIndex" << paymentOptionIndex;
+    //qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
+    //            << "paymentOptionIndex" << paymentOptionIndex;

    // TODO: wieder entfernen
    return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", QTime(), QTime());
@@ -1257,7 +1456,10 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
    Q_UNUSED(payment_option);
    Q_UNUSED(nextDay);

-    int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
+    int paymentOptionIndex = getPaymentOptionIndex(*cfg, start_datetime);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
+    }
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
    if (paymentMethodId == PaymentMethod::Steps) {
        if (tariffIs24_7(cfg)) {
@@ -2166,25 +2368,24 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
    QDateTime start = s;
    start.setTime(QTime(s.time().hour(), s.time().minute(), 0));

-    int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-
    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                          pop_id:" << pop_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start:" << start.toString(Qt::ISODate);
    }

+    int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+
    int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
    int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
    int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;

    static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);

-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
-
    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")               payment option id:" << pop_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")         time step configuration:" << pop_time_step_config;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")               prepaid option id:" << pop_prepaid_option_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") start parking time:" << start.toString(Qt::ISODate);
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  payment option id:" << pop_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  payment method id:" << static_cast<int>(paymentMethodId);
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")   time step config:" << pop_time_step_config;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  prepaid option id:" << pop_prepaid_option_id;
    }

    if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
@@ -2202,7 +2403,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
            // for instance: until 13.59: price 8, from 14:00: price 5, then for the next day: 8
            // for the following days: 8 euros

-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")       degressive";
+            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")         degressive:";
+            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex;
            m_timeSteps[paymentOptionIndex].clear();

            // lookup pop_next_id in worktimes;
@@ -2210,121 +2412,93 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
            if (w.has_value()) {
                QVector<ATBWeekDaysWorktime> const &vec = w.value();

-                if (pop_carry_over) {
-                    for (int i = 0; i < vec.size(); ++i) {
-                        QTime const &from = QTime::fromString(QString::fromStdString(vec[i].pwd_time_from), Qt::ISODate);
-                        QString const &toStr = QString::fromStdString(vec[i].pwd_time_to);
-                        QTime const &to = QTime::fromString(toStr, Qt::ISODate);
+                //if (pop_carry_over == false) {
+                for (int i = 1; i <= vec.size(); ++i) {
+                    QTime const &from = QTime::fromString(QString::fromStdString(vec[i-1].pwd_time_from), Qt::ISODate);
+                    QString const &toStr = QString::fromStdString(vec[i-1].pwd_time_to);
+                    QTime const &to = QTime::fromString(toStr, Qt::ISODate);

-                        int weekDayId = vec[i].pwd_period_day_in_week_id;
-                        if (start.date().dayOfWeek() == weekDayId) {
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
+                    int weekDayId = vec[i-1].pwd_period_day_in_week_id;
+                    if (start.date().dayOfWeek() == weekDayId) {
+                        if (DBG_LEVEL >= DBG_DEBUG) {
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
+                        }

-                            if (start.time() >= from) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
-                                if (start.time() < to) {
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
+                        if (start.time() >= from && start.time() < to) {
+                            int runtimeInMinutes = (start.time().secsTo(to) / 60);
+                            if (to.hour() == 23 && to.minute() == 59) {
+                                runtimeInMinutes += 1;
+                            }

-                                    int runtimeInMinutes = (start.time().secsTo(to) / 60);
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes" << runtimeInMinutes;
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") index" << paymentOptionIndex;
+                            if (DBG_LEVEL >= DBG_DEBUG) {
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes" << runtimeInMinutes;
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") index" << paymentOptionIndex;
+                            }
+                            // m_timeSteps[paymentOptionIndex] << runtimeInMinutes;

-                                    m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+                            cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;

-                                    cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
+                            int pop_id = vec[i-1].pwd_pop_id;
+                            // int pwd_id = vec[i-1].pwd_id;
+                            // int pwd_next_id = vec[i-1].pwd_next_id;

-                                    int pop_id = vec[i].pwd_pop_id;
-                                    int pwd_id = vec[i].pwd_id;
-                                    int pop_next_id = vec[i].pwd_next_id;
+                            if (DBG_LEVEL >= DBG_DEBUG) {
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
+                            }

-                                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                        int const durationId = itr->second.pra_payment_unit_id;
+                            int price = -1;
+                            int durationId = -1;

-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
-                                        // int const price = itr->second.pra_price;
+                            for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                durationId = itr->second.pra_payment_unit_id;

-                                        auto search = cfg->Duration.find(durationId);
-                                        if (search != cfg->Duration.end()) {
-                                            ATBDuration duration = search->second;
-                                            duration.pun_duration = runtimeInMinutes;
-                                            search->second = duration;
-                                        }
-                                    }
+                                price = itr->second.pra_price;

-                                    if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
-                                        // on the same day
-                                        start.setTime(to);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                    } else {
-                                        // on the next day
-                                        start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
-                                        start = start.addDays(1);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                    }
-
-
-                                    while ((s.secsTo(start) / 60) < 5000) {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-
-                                        pop_id = vec[i].pwd_pop_id;
-                                        pwd_id = vec[i].pwd_id;
-                                        pop_next_id = vec[i].pwd_next_id;
-
-                                        runtimeInMinutes += (start.time().secsTo(to) / 60);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pwd_id " << pwd_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id " << pop_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_next_id " << pop_next_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep" << nextTimeStep;
-
-                                        // ATBPaymentOption o = cfg->getPaymentOptionForId();
-
-                                        m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX pop" << pop_id;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX index" << paymentOptionIndex;
-
-#if 0
-                                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                            int const durationId = itr->second.pra_payment_unit_id;
-
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << durationId;
-                                            // int const price = itr->second.pra_price;
-
-                                            auto search = cfg->Duration.find(durationId);
-                                            if (search != cfg->Duration.end()) {
-                                                ATBDuration duration = search->second;
-                                                duration.pun_duration = runtimeInMinutes;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << runtimeInMinutes;
-                                                search->second = duration;
-                                            }
-                                        }
-#endif
-
-                                        if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
-                                            // on the same day
-                                            start.setTime(to);
-                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                        } else {
-                                            // on the next day
-                                            start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
-                                            start = start.addDays(1);
-
-                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                        }
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") until" << s.secsTo(start) / 60;
-                                    }
+                                auto search = cfg->Duration.find(durationId);
+                                if (search != cfg->Duration.end()) {
+                                    ATBDuration duration = search->second;
+                                    duration.pun_duration = runtimeInMinutes;
+                                    search->second = duration;
                                    break;
                                }
                            }
-                        }
-                    }
-                }
-            }

+                            if (price >= 0 && durationId >= 0) {
+                                if (DBG_LEVEL >= DBG_DEBUG) {
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")       price" << price;
+                                }
+
+                                pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+                                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                    if (durationId == itr->second.pra_payment_unit_id) {
+                                        itr->second.pra_price = price;
+                                        cfg->getPaymentOptions(paymentOptionIndex).pop_min_price = price;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") park min price" << price;
+                                        break;
+                                    }
+                                }
+                            }
+
+                            break;
+                        } // if (start.time() >= from && start.time() < to) {
+                    } // if (start.date().dayOfWeek() == weekDayId) {
+                } // for (int i = 1; i <= vec.size(); ++i) {
+
+                m_timeSteps[paymentOptionIndex].clear();
+                int runtimeInMinutes = 0;
+                for (Configuration::TariffDurationType::const_iterator it = cfg->Duration.cbegin();
+                     it != cfg->Duration.cend();
+                     ++it) {
+                    runtimeInMinutes +=  it->second.pun_duration;
+                    m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+                }
+
+                //} // if (pop_carry_over == false) {
+            } // if (w.has_value()) {
        } else {
            uint16_t timeStepCompensation = 0;

@@ -2401,10 +2575,10 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                            }
                        }
                    } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        if (DBG_LEVEL >= DBG_DEBUG) {
+                        //if (DBG_LEVEL >= DBG_DEBUG) {
                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")          carry over time range to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
-                        }
+                        //}

                        m_timeSteps[paymentOptionIndex].clear();

@@ -2435,9 +2609,9 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                        QDateTime nextTimeStep = start;
                        int runtimeInMinutes = 0;

-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;

-                        int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
+                        // int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;

                        // TODO: auslagern
                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
@@ -2451,18 +2625,18 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                            }
                        }

-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;

                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                            int const durationId = itr->second.pra_payment_unit_id;

-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
                            // int const price = itr->second.pra_price;

                            auto search = cfg->Duration.find(durationId);
                            if (search != cfg->Duration.end()) {
                                ATBDuration duration = search->second;
-                                ATBDuration &previous = search->second;
+                                // ATBDuration &previous = search->second;

                                if (duration.pun_interpolation_id == -1) {

@@ -2473,7 +2647,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                    break;
                                }

-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+                                //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;

                                std::optional<ATBInterpolation> ipolCheck = cfg->getInterpolationType(duration.pun_interpolation_id);
                                if (ipolCheck) {
@@ -2492,7 +2666,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")         interpolation dynamic end:" << interpolationEnd.toString(Qt::ISODate);
                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")    interpolation dynamic end time:" << end_time;

-                                        int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+                                        // int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;

                                        runtimeInMinutes += duration.pun_duration;
                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
@@ -2534,10 +2708,10 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                    } else
                                    if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {

-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;

                                        if (paymentOptionIndex == 1) { // testing TODO: muss in die payment options hinein
                                            if (runtimeInMinutes == 0) {
@@ -2546,6 +2720,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                                    duration.pun_duration = runtimeInMinutes;
                                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                                    search->second = duration;
+                                                    cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
                                                    continue;
                                                }
                                            }
@@ -2554,6 +2729,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                        if (runtimeInMinutes == 0) {
                                            if (start.time() < carryOverStart) {
                                                runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
+                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")       start:" << start.toString(Qt::ISODate);
+                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")       carryOverStart:" << carryOverStart.toString(Qt::ISODate);
                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
                                                duration.pun_duration = runtimeInMinutes;
@@ -2563,11 +2740,10 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                            }
                                            continue;
                                        }
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
-
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;

                                        QDateTime s = start.addSecs(runtimeInMinutes * 60);
-                                        int const minutes = s.time().secsTo(carryOverStart) / 60;
+                                        // int const minutes = s.time().secsTo(carryOverStart) / 60;

 #if 0
                                        if (minutes > 0) {
@@ -2588,6 +2764,9 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                        runtimeInMinutes += duration.pun_duration;
                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);

+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")       carryOverStart:" << carryOverStart.toString(Qt::ISODate);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
+
                                        // TOOO: truncate-flag == false
                                        if (nextTimeStep.time() > carryOverStart) {
                                            int const backTime = carryOverStart.secsTo(nextTimeStep.time());
@@ -2595,21 +2774,26 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                            nextTimeStep.setTime(carryOverStart);
                                            nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
                                            runtimeInMinutes += (backTime + carryOverDuration);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  runTimeInMinutes:" << runtimeInMinutes;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
                                        } else
                                        if (nextTimeStep.time() < carryOverStart) {
                                            int const forwardTime = nextTimeStep.time().secsTo(carryOverStart) / 60;
                                            runtimeInMinutes += forwardTime;
                                            nextTimeStep.setTime(carryOverStart);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  runTimeInMinutes:" << runtimeInMinutes;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
                                        }

-                                        //if (DBG_LEVEL >= DBG_DEBUG) {
+                                        if (DBG_LEVEL >= DBG_DEBUG) {
                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
-                                        //}
+                                        }

                                        duration.pun_duration = runtimeInMinutes;
+                                        // duration.pun_duration = runtimeInMinutes - carryOverDuration;
                                        m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                        search->second = duration;
                                    } else {
@@ -2674,12 +2858,15 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
    // paymentOptionIndex = 1;

    int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+    int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
    int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;

    uint32_t price = 0;
+    int pun_duration = 0;

-    qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
+    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;

    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
    {
@@ -2688,27 +2875,28 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p

        Q_ASSERT(pun_id == payment_unit_id);

-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
+        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
+        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;

+        if (pop_accumulate_durations) {
+            pun_duration += cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        } else {
+            pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        }

-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(1)->second.pun_duration;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(2)->second.pun_duration;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(3)->second.pun_duration;
-
-        int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
-        //int const pun_duration = cfg->Duration.find(2)->second.pun_duration;
        if (pop_accumulate_prices) {
            price += itr->second.pra_price;
        } else {
            price = (uint32_t)(itr->second.pra_price);
        }

-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+        }

        if (timeStep == pun_duration) {
            qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
@@ -2721,8 +2909,13 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p

 uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
    int const pop_id = cfg->getPaymentOptions().pop_id;
+    int const pop_accumulate_prices = cfg->getPaymentOptions().pop_accumulate_prices;

+    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") accumulate prices" << pop_accumulate_prices;
+
+    int new_price = 0;
    uint32_t duration = 0;
+    uint32_t duration_previous = 0;

    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
    {
@@ -2738,8 +2931,22 @@ uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
        if (pra_price < price) {
            duration = durationUnit;
        }
+
+        if (pop_accumulate_prices) {
+            new_price += pra_price;
+            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pra_price:" << pra_price;
+            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      new_price:" << new_price;
+            if (new_price <= price) {
+               duration_previous = durationUnit;
+               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
+            } else {
+               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
+               return duration_previous;
+            }
+        }
    }

+    qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration" << duration << "for price" << price;
    return duration;
 }

--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
@@ -8,6 +8,8 @@
 #include "tariff_global_defines.h"
 #include "tariff_carryover.h"
 #include "tariff_global_defines.h"
+#include "tariff_settings.h"
+#include "tariff_carryover_settings.h"

 #include <QString>
 #include <QDebug>
@@ -21,7 +23,13 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
    if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
    if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
    if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
-    //if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Monday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Tuesday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Wednesday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Thursday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Friday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Saturday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Sunday") == 0) return MemberType::WeekDaysType;
    if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
    if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
    if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
@@ -38,6 +46,298 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
    else return MemberType::UnknownType;
 }

+ATBWeekDay parseWeekDay(Configuration &cfg,
+                        rapidjson::GenericMemberIterator<false,
+                                                         rapidjson::UTF8<char>,
+                                                         rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>> k,
+                        QString const &innerObjName,
+                        Qt::DayOfWeek weekDay,
+                        QString const &weekDayName) {
+    int max_price = 0;
+    int min_price = 0;
+    int min_time = 0;
+    int max_time = 0;
+    int duration = 0;
+    ATBWeekDay WeekDay;
+    QTime start, end, parking_time_limit, about_to_exceed_limit;
+    ATBTariffCarryOverSettings::ParkingTimeLimitChecker parkTimeLimitChecker;
+    if (innerObjName == QString("week_day_default")) {
+        if (k->value.IsObject()) {
+            auto obj = k->value.GetObject();
+            for (auto m = obj.MemberBegin(); m != obj.MemberEnd(); ++m) {
+                QString const &name = m->name.GetString();
+                if (name == "week_day_type") {
+                    //
+                } else
+                if (name == "tariff_settings") {
+                    if (m->value.IsObject()) {
+                        auto obj = m->value.GetObject();
+                        for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                            QString const &name = QString::fromStdString(n->name.GetString());
+                            if (name == "min_time") {
+                                if (n->value.IsInt()) { min_time = n->value.GetInt(); }
+                            } else if (name == "max_time") {
+                                if (n->value.IsInt()) { max_time = n->value.GetInt(); }
+                            } else if (name == "min_price") {
+                                if (n->value.IsInt()) { min_price = n->value.GetInt(); }
+                            } else if (name == "max_price") {
+                                if (n->value.IsInt()) { max_price = n->value.GetInt(); }
+                            }
+                        }
+                    }
+                } else
+                if (name == "carry_over_settings") {
+                    if (m->value.IsObject()) {
+                        auto obj = m->value.GetObject();
+                        for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                            QString const &name = QString::fromStdString(n->name.GetString());
+                            if (name == "duration") {
+                                if (n->value.IsInt()) {
+                                    duration = n->value.GetInt();
+                                }
+                            } else
+                            if (name == "start") {
+                                if (n->value.IsString()) {
+                                    start = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                }
+                            } else
+                            if (name == "end") {
+                                if (n->value.IsString()) {
+                                    end = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                }
+                            } else
+                            if (name == "parking_time_limit") {
+                                if (n->value.IsObject()) {
+                                    auto o = n->value.GetObject();
+                                    for (auto l = o.MemberBegin(); l != o.MemberEnd(); ++l) {
+                                        if (l->name.IsString()) {
+                                            QString const &member = QString::fromStdString(l->name.GetString());
+                                            if (member == "prev_day_sunday?") {
+                                                if (l->value.IsArray()) {
+                                                    auto limits = l->value.GetArray();
+                                                    if (limits.Size() >= 2) {
+                                                        about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                        parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                    }
+                                                    parkTimeLimitChecker = [&cfg, weekDay, weekDayName](ATBTariffCarryOverSettings const& cs,
+                                                                                                        QDateTime const &startTime,
+                                                                                                        QDateTime const &endTime,
+                                                                                                        int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (endTime.date().dayOfWeek() == (int)weekDay) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: [%1, %2 end-time=%3], but time-limit=%4")
+                                                                                        .arg(weekDayName)
+                                                                                        .arg(endTime.date().toString(Qt::ISODate))
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                }
+                                            } else
+                                            if (member == "prev_day_holiday?") {
+                                                if (l->value.IsArray()) {
+                                                    auto limits = l->value.GetArray();
+                                                    if (limits.Size() >= 2) {
+                                                        about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                        parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                    }
+                                                    parkTimeLimitChecker = [&cfg, weekDayName](ATBTariffCarryOverSettings const& cs,
+                                                                                               QDateTime const &startTime,
+                                                                                               QDateTime const &endTime,
+                                                                                               int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (previousDayHoliday(cfg, endTime)) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: [%1, %2, end-time=%3], but time-limit=%4")
+                                                                                        .arg(weekDayName)
+                                                                                        .arg(endTime.date().toString(Qt::ISODate))
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            ATBTariffSettings ts(max_price, min_price, max_time, min_time);
+            ATBTariffCarryOverSettings cs(duration, start, end, parking_time_limit, about_to_exceed_limit,
+                                          parkTimeLimitChecker);
+            WeekDay = ATBWeekDay(weekDay, weekDayName, ATBWeekDay::USUAL_WEEKDAY, QDate(), ts, cs);
+
+        } // if (k->value.IsObject()) {
+    } else {
+        QDate date(QDate::fromString(innerObjName, Qt::ISODate));
+        if (date.isValid()) {
+            if (k->value.IsObject()) {
+                auto obj = k->value.GetObject();
+                for (auto m = obj.MemberBegin(); m != obj.MemberEnd(); ++m) {
+                    QString const &name = m->name.GetString();
+                    if (name == "week_day_type") {
+                        // TODO
+                    } else
+                    if (name == "tariff_settings") {
+                        if (m->value.IsObject()) {
+                            auto obj = m->value.GetObject();
+                            for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                                QString const &name = QString::fromStdString(n->name.GetString());
+                                if (name == "min_time") {
+                                    if (n->value.IsInt()) { min_time = n->value.GetInt(); }
+                                } else if (name == "max_time") {
+                                    if (n->value.IsInt()) { max_time = n->value.GetInt(); }
+                                } else if (name == "min_price") {
+                                    if (n->value.IsInt()) { min_price = n->value.GetInt(); }
+                                } else if (name == "max_price") {
+                                    if (n->value.IsInt()) { max_price = n->value.GetInt(); }
+                                }
+                            }
+                        }
+                    } else
+                    if (name == "carry_over_settings") {
+                        if (m->value.IsObject()) {
+                            auto obj = m->value.GetObject();
+                            for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                                QString const &name = QString::fromStdString(n->name.GetString());
+                                if (name == "duration") {
+                                    if (n->value.IsInt()) {
+                                        duration = n->value.GetInt();
+                                    }
+                                } else
+                                if (name == "start") {
+                                    if (n->value.IsString()) {
+                                        start = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                    }
+                                } else
+                                if (name == "end") {
+                                    if (n->value.IsString()) {
+                                        end = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                    }
+                                } else
+                                if (name == "parking_time_limit") {
+                                    if (n->value.IsObject()) {
+                                        auto o = n->value.GetObject();
+                                        for (auto l = o.MemberBegin(); l != o.MemberEnd(); ++l) {
+                                            if (l->name.IsString()) {
+                                                QString const &member = QString::fromStdString(l->name.GetString());
+                                                if (member == "default") {
+                                                    if (l->value.IsArray()) {
+                                                        auto limits = l->value.GetArray();
+                                                        if (limits.Size() >= 2) {
+                                                            about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                            parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                        }
+                                                    }
+
+                                                    parkTimeLimitChecker = [&cfg, weekDay](ATBTariffCarryOverSettings const& cs,
+                                                                                           QDateTime const &startTime,
+                                                                                           QDateTime const &endTime,
+                                                                                           int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (endTime.date().dayOfWeek() == (int)weekDay) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                } else
+                                                if (member == "prev_day_holiday?") {
+                                                    if (l->value.IsArray()) {
+                                                        auto limits = l->value.GetArray();
+                                                        if (limits.Size() >= 2) {
+                                                            about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                            parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                        }
+                                                    }
+                                                    parkTimeLimitChecker = [&cfg](ATBTariffCarryOverSettings const& cs,
+                                                                                  QDateTime const &startTime,
+                                                                                  QDateTime const &endTime,
+                                                                                  int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (previousDayHoliday(cfg, endTime)) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                ATBTariffSettings ts(max_price, min_price, max_time, min_time);
+                ATBTariffCarryOverSettings cs(duration, start, end, parking_time_limit,
+                                              about_to_exceed_limit, parkTimeLimitChecker);
+                WeekDay = ATBWeekDay(weekDay, weekDayName, ATBWeekDay::HOLIDAY, date, ts, cs);
+
+            } else {// if (k->value.IsObject()) {
+                qCritical() << __func__ << ":" << __LINE__ << "ERROR: no object";
+            }
+
+        } else {
+            qCritical() << __func__ << __LINE__
+                        << "ERROR: invalid date for" << weekDayName << "," << innerObjName;
+        }
+    }
+
+    return WeekDay;
+}
+
 /// <inheritdoc/>
 bool Configuration::ParseJson(Configuration* cfg, const char* json)
 {
@@ -96,7 +396,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
            ATBPaymentRate PaymentRate;
            ATBSpecialDaysWorktime SpecialDaysWorktime;
            ATBSpecialDays SpecialDays;
-            ATBWeekDays  WeekDays;
+            //ATBWeekDay WeekDay;
            ATBWeekDaysWorktime  WeekDaysWorktime;
            ATBPeriodYear YearPeriod;
            ATBDailyTicket DailyTicket;
@@ -112,29 +412,29 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
            MemberType mb_type = MemberType::UnknownType;
            this->currentPaymentOptions.clear();

-                // Get all JSON object members
-                // This code should run only once (to load JSON variables into memory)
-                for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
-                {
-                        // Get name of all general members of JSON, don't print name if NULL
-                        const char* mb_name = i->name.GetString();
-            if (mb_name == NULL) continue;
+            // Get all JSON object members
+            // This code should run only once (to load JSON variables into memory)
+            for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
+            {
+                // Get name of all general members of JSON, don't print name if NULL
+                const char* mb_name = i->name.GetString();
+                if (mb_name == NULL) continue;

-            if (document[mb_name].IsString()) {
-                QString const _mb_name(mb_name);
-                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
-                    cfg->project.project = document[mb_name].GetString();
-                    continue;
-                 }
-                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
-                    cfg->project.version = document[mb_name].GetString();
-                    continue;
+                if (document[mb_name].IsString()) {
+                    QString const _mb_name(mb_name);
+                    if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
+                        cfg->project.project = document[mb_name].GetString();
+                        continue;
+                     }
+                    if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
+                        cfg->project.version = document[mb_name].GetString();
+                        continue;
+                    }
+                    if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
+                        cfg->project.info = document[mb_name].GetString();
+                        continue;
+                    }
                }
-                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
-                    cfg->project.info = document[mb_name].GetString();
-                    continue;
-                }
-            }

            // ... everything else should be an array
            if (!document[mb_name].IsArray()) {
@@ -171,6 +471,36 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                    {
                    case MemberType::UnknownType:
                        break;
+                    case MemberType::WeekDaysType: {
+                        ATBWeekDay WeekDay;
+                        if (QString(mb_name) == "Monday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Monday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Tuesday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Tuesday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Wednesday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Wednesday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Thursday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Thursday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Friday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Friday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Saturday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Saturday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Sunday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Sunday, mb_name);
+                        } else {
+                            qCritical() << "ERROR: unknown week day" << mb_name;
+                        }
+
+                        cfg->WeekDays.insert(pair<Qt::DayOfWeek, ATBWeekDay>(WeekDay.m_id, WeekDay));
+                        // qCritical() << WeekDay;
+
+                    } break;
                    case MemberType::CarryOverType: {
                        if (QString(inner_obj_name) == QString("carry_over_id")) {
                            if (k->value.IsInt()) {
@@ -261,6 +591,49 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
                                TariffPrepaidOption.static_end = t;
                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("prepaid_week")) {
+                            if (k->value.IsArray()) {
+                                auto days = k->value.GetArray();
+                                for (rapidjson::SizeType j=0; j < days.Size(); ++j) {
+                                    if (days[j].IsObject()) {
+                                        auto weekday = days[j].GetObject();
+                                        for (auto w = weekday.MemberBegin(); w != weekday.MemberEnd(); ++w) {
+                                            int day = j+1; // 8 entries
+
+                                            TariffPrepaidOption.prepaid[day].day = 0;
+
+                                            QString member(QString::fromStdString(w->name.GetString()));
+                                            if (member == "prepaid_day") {
+                                                if (w->value.IsInt()) {
+                                                    rapidjson::SizeType const d = w->value.GetInt();
+                                                    if (d != (j+1)) {
+                                                        qCritical() << "ERROR: misconfigured jsonfile" << d << "!=" << (j+1);
+                                                    }
+                                                    TariffPrepaidOption.prepaid[day].day = day;
+                                                }
+                                            } else
+                                            if (member == "prepaid_duration") {
+                                                if (w->value.IsInt()) {
+                                                    TariffPrepaidOption.prepaid[day].duration = w->value.GetInt();
+                                                }
+                                            } else
+                                            if (member == "prepaid_static_start") {
+                                                if (w->value.IsString()) {
+                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
+                                                    TariffPrepaidOption.prepaid[day].static_start = t;
+                                                }
+                                            } else
+                                            if (member == "prepaid_static_end") {
+                                                if (w->value.IsString()) {
+                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
+                                                    TariffPrepaidOption.prepaid[day].static_end = t;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                        }
                    } break;
                    case MemberType::InterpolationType: {
@@ -598,6 +971,23 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                            if (k->value.IsInt()) {
                                this->currentPaymentOptions.last().pop_use_only_for_duration = k->value.GetInt();
                            }
+                        } else if (strcmp(inner_obj_name, "pop_plus_steps") == 0) {
+                            if (k->value.IsInt()) {
+                                this->currentPaymentOptions.last().pop_plus_steps = k->value.GetInt();
+                                this->currentPaymentOptions.last().pop_plus_steps_saved = k->value.GetInt();
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_minus_steps") == 0) {
+                            if (k->value.IsInt()) {
+                                this->currentPaymentOptions.last().pop_minus_steps = k->value.GetInt();
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_allow_overpay") == 0) {
+                            if (k->value.IsBool()) {
+                                this->currentPaymentOptions.last().pop_allow_overpay = k->value.GetBool();
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_apply_carry_over_to_ticket_endtime") == 0) {
+                            if (k->value.IsBool()) {
+                                this->currentPaymentOptions.last().pop_apply_carry_over_to_ticket_endtime = k->value.GetBool();
+                            }
                        } else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) {
                            this->currentPaymentOptions.last().pop_payment_method_id = k->value.GetInt();
                        } else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) {
@@ -720,6 +1110,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                        else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
                        else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
                        else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pedwt_paid") == 0) SpecialDaysWorktime.pedwt_paid = k->value.GetInt();
                        break;
                /*case MemberType::WeekDaysType:
                        if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
@@ -762,6 +1153,11 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                switch (mb_type) {
                case MemberType::UnknownType:
                    break;
+                case MemberType::WeekDaysType:
+                    // qCritical() << "INSERT" << (int)WeekDay.m_id << WeekDay.m_date.toString(Qt::ISODate);
+                    // cfg->WeekDays.insert(pair<Qt::DayOfWeek, ATBWeekDay>(WeekDay.m_id, WeekDay));
+                    // qCritical() << WeekDay;
+                    break;
                case MemberType::PaymentMethodType:
                    cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
                    break;
@@ -882,7 +1278,7 @@ std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &sta
                ATBInterpolation interpolation = ipolCheck.value();
                switch (duration.pun_interpolation_id) {
                    case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
                    break;
                    case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
@@ -987,6 +1383,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
            for (int opt=0; opt < numOptions; ++opt) {
                uint64_t const pop_id = getPaymentOptions(opt).pop_id;
                if (pop_id == (uint64_t)sd.ped_payment_option_id) {
+
+                    qCritical() << __func__ << __LINE__ << opt;
+
                    return opt;
                }
            }
@@ -996,6 +1395,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
    for (int opt=0; opt < numOptions; ++opt) {
        uint64_t const pop_business_hours = getPaymentOptions(opt).pop_business_hours;

+        if (pop_business_hours == 0) { // 0 == 24/7
+            return opt;
+        }

        uint64_t p = 0;
        int const dayOfWeek = dt.date().dayOfWeek();
@@ -1026,6 +1428,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
        }

        if ((pop_business_hours & p) == p) {
+
+            qCritical() << __func__ << __LINE__ << opt;
+
            return opt;
        }
    }
@@ -1073,7 +1478,6 @@ bool Configuration::isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime

    if (isSpecialDay(dt)) {
        bool const &r = ((businessHours & BusinessHours::OFFICIAL_HOLIDAY) == BusinessHours::OFFICIAL_HOLIDAY);
-        qCritical() << "XXXXXXXXXXXXXXXXXX r" << r << businessHours;
        return r;
    }

@@ -1148,6 +1552,7 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
    if (paymentOptions) {
        QVector<ATBPaymentOption> const vec = paymentOptions.value();
        PermitType const p(permitType);
+
        for (int i = 0; i < vec.size(); ++i) {
            if (vec[i].pop_product_name == p.toString()) {
               return i;
@@ -1161,8 +1566,10 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
 int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
    if (paymentOptions) {
+
        QVector<ATBPaymentOption> const vec = paymentOptions.value();
        PermitType const p(permitType);
+
        for (int i = 0; i < vec.size(); ++i) {
            if (vec[i].pop_product_name == p.toString()) {
               return i;
@@ -1173,6 +1580,73 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
    return 0;
 }

+int getPaymentOptionIndex(Configuration const &cfg, QDateTime const &dt) {
+
+    int const numOptions = cfg.getAllPaymentOptions().size();
+
+    // qCritical() << __func__ << ":" << __LINE__ << "numOptions" << numOptions;
+
+    for (int opt=0; opt < numOptions; ++opt) {
+        uint64_t const pop_business_hours = cfg.getPaymentOptions(opt).pop_business_hours;
+
+        if (pop_business_hours == 0) { // 0 == 24/7
+            return opt;
+        }
+
+        // QDateTime const dt = QDateTime::currentDateTime();
+        int const dayOfWeek = dt.date().dayOfWeek();
+
+        // qCritical() << __func__ << ":" << __LINE__ << "dayOfWeek" << dayOfWeek;
+
+        if (isHoliday(cfg, dt)) {
+            if (pop_business_hours & BusinessHours::OFFICIAL_HOLIDAY) {
+                return opt;
+            }
+        } else {
+            switch (dayOfWeek) {
+            case (int)Qt::Monday: {
+                if (pop_business_hours & BusinessHours::MON) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Tuesday: {
+                if (pop_business_hours & BusinessHours::TUE) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Wednesday: {
+                if (pop_business_hours & BusinessHours::WED) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Thursday: {
+                if (pop_business_hours & BusinessHours::THU) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Friday: {
+                if (pop_business_hours & BusinessHours::FRI) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Saturday: {
+                if (pop_business_hours & BusinessHours::SAT) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Sunday: {
+                if (pop_business_hours & BusinessHours::SUN) {
+        qCritical() << __func__ << ":" << __LINE__ << "opt" << opt;
+                    return opt;
+                }
+            } break;
+            }
+        }
+    }
+
+    return -1;
+}
+
 std::optional<QVector<ATBTariffProduct>>
 Configuration::getTariffProductForProductId(PermitType permitType) const {
    QString permitTypeName(permitType);
@@ -1310,11 +1784,14 @@ Configuration::getPaymentOptionsForAllKeys() const {
    return value;
 }

+// TODO: umbenennen: getPaymentOptionForPermitType
 std::optional<ATBPaymentOption>
 Configuration::getPaymentOptionForKey(PERMIT_TYPE permitType) const {
    return getPaymentOptionForKey(static_cast<int>(permitType));
 }

+
+// TODO: umbenennen: getPaymentOptionForPermitType
 std::optional<ATBPaymentOption>
 Configuration::getPaymentOptionForKey(int permitType) const {
    std::optional<ATBPaymentOption> value;
@@ -1331,6 +1808,7 @@ Configuration::getPaymentOptionForKey(int permitType) const {
    return value;
 }

+// TODO: umbenennen: getPaymentOptionForPermitType
 std::optional<ATBPaymentOption>
 Configuration::getPaymentOptionForKey(QString const &permitTypeStr) const {
    PERMIT_TYPE permitType = PermitType::toPermitType(permitTypeStr);
@@ -1423,3 +1901,43 @@ Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {

    return value;
 }
+
+bool isHoliday(Configuration const &cfg, QDateTime const &t) {
+    int const weekDay = t.date().dayOfWeek();
+
+    for (auto[iter, rEnd] = cfg.WeekDays.equal_range(static_cast<Qt::DayOfWeek>(weekDay));
+         iter != rEnd;
+         ++iter) {
+
+        if (iter->second.m_type == ATBWeekDay::WeekDayType::HOLIDAY) {
+            QDate const &d = iter->second.m_date;
+            if (!d.isNull() && d.isValid()) {
+                if (t.date() == d) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+bool previousDayHoliday(Configuration const &cfg, QDateTime const &t) {
+    int const weekDay = t.date().dayOfWeek();
+    int const previousWeekDay = (weekDay == static_cast<int>(Qt::Monday)) ?
+                static_cast<int>(Qt::Sunday) : (weekDay - 1);
+
+    for (auto[iter, rEnd] = cfg.WeekDays.equal_range(static_cast<Qt::DayOfWeek>(previousWeekDay));
+         iter != rEnd;
+         ++iter) {
+
+        if (iter->second.m_type == ATBWeekDay::WeekDayType::HOLIDAY) {
+            QDate const &d = iter->second.m_date;
+            if (!d.isNull() && d.isValid()) {
+                if (t.addDays(-1).date() == d) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
--- a/library/src/utilities.cpp
+++ b/library/src/utilities.cpp
@@ -207,7 +207,13 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
                              dt.date().day());
                QDate const s(2004, year.second.pye_start_month, year.second.pye_start_day);
                QDate const e(2004, year.second.pye_end_month, year.second.pye_end_day);
-                return (d >= s && d <= e);
+                //qCritical() << __func__ << __LINE__ << "    d" << d.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "start" << s.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "  end" << e.toString(Qt::ISODate);
+                if (s <= e) {
+                    return (d >= s && d <= e);
+                }
+                return (d >= s || d <= e);
            })) {
        qCritical() << "NO VALID YEAR PERIOD";
        return false;
@@ -215,6 +221,43 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
    return true;
 }

+std::optional<ATBPeriodYear>
+Utilities::GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime) {
+
+    ATBPeriodYear period;
+    std::optional<ATBPeriodYear> value;
+
+    for (multimap<int, ATBPeriodYear>::const_iterator it = cfg->YearPeriod.cbegin();
+         it != cfg->YearPeriod.cend();
+         ++it) {
+        QDate const s(currentDateTime.date().year(), it->second.pye_start_month, it->second.pye_start_day);
+        QDate const e(currentDateTime.date().year(), it->second.pye_end_month, it->second.pye_end_day);
+
+        QDateTime start(currentDateTime);
+        QDateTime end(currentDateTime);
+
+        start.setDate(s);
+        end.setDate(e);
+
+        if (start.date().dayOfYear() < end.date().dayOfYear()) {
+            // start and end in the same year
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() &&
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        } else {
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() ||
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        }
+    }
+
+    return value;
+}
+
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -43,13 +43,13 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
-#define BAD_NEUENAHR_AHRWEILER                  (0)
+#define BAD_NEUENAHR_AHRWEILER                  (1)
 #define NEUHAUSER_CHRISTOPH_REISEN              (0)
 #define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
 #define NEUHAUSER_STOCKERAU                     (0)
 #define KLEIPEDA_LITAUEN                        (0)
 #define SEXTEN                                  (0)
-#define SCHNALS_LEITER_KIRCHL                   (1)
+#define SCHNALS_LEITER_KIRCHL                   (0)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
 #define VALSER_ALM                              (0)

@@ -339,22 +339,22 @@ int main() {
    cout << endl;

    if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
-        pop_max_time = get_maximal_parkingtime(&cfg);
-        pop_min_price = get_minimal_parkingprice(&cfg);
-        pop_max_price = get_maximal_parkingprice(&cfg);
-        pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+        //pop_min_time = get_minimal_parkingtime(&cfg);
+        //pop_max_time = get_maximal_parkingtime(&cfg);
+        //pop_min_price = get_minimal_parkingprice(&cfg);
+        //pop_max_price = get_maximal_parkingprice(&cfg);
+        //pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;

-        qCritical() << "        pop_min_time: " << pop_min_time;
-        qCritical() << "        pop_max_time: " << pop_max_time;
-        qCritical() << "       pop_min_price: " << pop_min_price;
-        qCritical() << "       pop_max_price: " << pop_max_price;
+        //qCritical() << "        pop_min_time: " << pop_min_time;
+        //qCritical() << "        pop_max_time: " << pop_max_time;
+        //qCritical() << "       pop_min_price: " << pop_min_price;
+        //qCritical() << "       pop_max_price: " << pop_max_price;


-        QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-        qCritical() << "TimeSteps" << timeSteps;
+        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        //qCritical() << "TimeSteps" << timeSteps;

-        return 0;
+        // return 0;

        CalcState cs;
        double cost;
@@ -363,8 +363,7 @@ int main() {

        // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
        for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 5, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
-            QDateTime end;
+            QDateTime s(QDate(2024, 8, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday

            switch (day) {
            case (int)Qt::Monday:
@@ -390,6 +389,30 @@ int main() {
                break;
            }

+            QDateTime start(s);
+            start.setTime(QTime(21, 30, 0));
+
+            QDateTime end;
+            int netto_parking_time = 14 * 60;
+            struct price_t costs;
+            PermitType pt(PERMIT_TYPE::SHORT_TERM_PARKING);
+
+            double cost = 150;
+
+            //cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time,
+            //                                      end, &costs, pt);
+
+
+
+            //qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << costs.netto
+            //            << "> end" << end.toString(Qt::ISODate);
+
+            cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
+            //}
+
+            exit(0);

            /*
            CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
@@ -401,9 +424,11 @@ int main() {
                                                        bool prepaid = true);
            */

-            for (int minutes = 0; minutes < 1440; ++minutes) {
-                QDateTime start = s.addSecs(minutes * 60);
-                QDateTime effectiveStart = start;
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
+            for (int minutes = 540; minutes <= 540; ++minutes) {
+                // QDateTime start = s.addSecs(minutes * 60);
+                QDateTime start(QDateTime::currentDateTime());
+                QDateTime effectiveStart(QDateTime::currentDateTime());

                if (start.time() < QTime(8, 0, 0)) {
                    effectiveStart.setTime(QTime(8, 0, 0));
@@ -415,55 +440,18 @@ int main() {
                    effectiveStart.setTime(QTime(8, 0, 0)); // next day
                }

-                for (int i = 0; i <= 2100; i += 10) {
+                for (int i = 30; i <= 30; i += 10) {
                //for (int i = 2100; i <= 2100; i += 10) {
                    cost = i;

-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(22, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(22, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 600; // 22:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1320) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
                    }

                    if (!cs) {
                        qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-                        qCritical() << cs.toString();
                    }
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
                }
            }
        }
@@ -552,7 +540,7 @@ int main() {
            */

            //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 0; minutes < 1440; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                QDateTime start = s.addSecs(minutes * 60);

                // qCritical() << "start" << start.toString(Qt::ISODate);
@@ -569,66 +557,32 @@ int main() {
                    effectiveStart.setTime(QTime(8, 0, 0)); // next day
                }

+/*
                for (int i = 10; i <= 400; i += 10) {
-                //for (int i = 2100; i <= 2100; i += 10) {
                    cost = i;

-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
-
-
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
                                    << "> end" << end.toString(Qt::ISODate);
-
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(19, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(19, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 780; // 19:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-#if 0
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1140) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
-#endif
                    }

                    if (!cs) {
                        qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-//                        qCritical() << cs.toString();
                    }
+                }
+*/
+                int netto_parking_time = 60;
+                struct price_t price;

-#if 0
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
-#endif
+                qCritical() << "start" << start.toString(Qt::ISODate);

+                QDateTime const s = start;
+
+                if ((cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                        qCritical() << "start" << s.toString(Qt::ISODate)
+                                    << "netto_parking_time" << netto_parking_time
+                                    << "< price" << price.netto
+                                    << "> end" << end.toString(Qt::ISODate);
                }
            }
        }
@@ -737,7 +691,7 @@ int main() {
                    effectiveStart.setTime(QTime(7, 0, 0)); // next day
                }

-#if 1
+#if 0
                PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
                for (int i = 200; i <= 200; i += 10) {
                    cost = i;
@@ -760,7 +714,7 @@ int main() {
                //for (int i = 2100; i <= 2100; i += 10) {
                    cost = i;

-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW)))) {      // return value
                    }

                    if (!cs) {
@@ -801,7 +755,7 @@ int main() {
    int pop_max_price;
    int pop_daily_card_price;

-    int zone = 2;
+    int zone = 3;

    if (zone == 1) {
        input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json");
@@ -823,22 +777,85 @@ int main() {
    cout << endl;

    if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
-        pop_max_time = get_maximal_parkingtime(&cfg);
-        pop_min_price = get_minimal_parkingprice(&cfg);
-        pop_max_price = get_maximal_parkingprice(&cfg);
-        pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;

-        qCritical() << "        pop_min_time: " << pop_min_time;
-        qCritical() << "        pop_max_time: " << pop_max_time;
-        qCritical() << "       pop_min_price: " << pop_min_price;
-        qCritical() << "       pop_max_price: " << pop_max_price;
+        if (zone == 1 || zone == 3) {
+/*
+            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time_pkw: " << pop_min_time;
+            qCritical() << "        pop_max_time_pkw: " << pop_max_time;
+            qCritical() << "       pop_min_price_pkw: " << pop_min_price;
+            qCritical() << "       pop_max_price_pkw: " << pop_max_price;
+
+            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time_bus: " << pop_min_time;
+            qCritical() << "        pop_max_time_bus: " << pop_max_time;
+            qCritical() << "       pop_min_price_bus: " << pop_min_price;
+            qCritical() << "       pop_max_price_bus: " << pop_max_price;
+*/
+        }
+        if (zone == 2) {
+            pop_min_time = get_minimal_parkingtime(&cfg);
+            pop_max_time = get_maximal_parkingtime(&cfg);
+            pop_min_price = get_minimal_parkingprice(&cfg);
+            pop_max_price = get_maximal_parkingprice(&cfg);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time: " << pop_min_time;
+            qCritical() << "        pop_max_time: " << pop_max_time;
+            qCritical() << "       pop_min_price: " << pop_min_price;
+            qCritical() << "       pop_max_price: " << pop_max_price;
+        }

        //QDateTime start = QDateTime::currentDateTime();
        //start.setTime(QTime(12, 0, 0));
        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, start);
        //qCritical() << "TimeSteps" << timeSteps;
        //return 0;
+        if (zone == 1) {
+            //int minParkingTime = get_minimal_parkingtime(&cfg);
+            QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+            qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+
+            if (paymentOptionIndex < 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            QSet<uint32_t> const prices_pkw{600, 1200, 1800, 2400, 3000, 3600, 4200};
+            QSet<uint32_t> const prices_bus{3000, 6000, 9000, 12000, 15000, 18000, 21000};
+
+            QDateTime end;
+            CalcState calcState;
+            QDateTime s(QDateTime::currentDateTime());
+
+            s.setTime(QTime(12, 0, 0));
+
+            //calcState = compute_duration_for_parking_ticket(&cfg, s,
+            //                                    (double)1200, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+            //qCritical() << end.toString(Qt::ISODate);
+            //qCritical() << calcState.toString();
+
+            calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                (double)50, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
+            qCritical() << end.toString(Qt::ISODate);
+            qCritical() << calcState.toString();
+        }

        if (zone == 2) {
            //int minParkingTime = get_minimal_parkingtime(&cfg);
@@ -858,6 +875,16 @@ int main() {

            QSet<uint32_t> const prices{600, 1200, 1800, 2400, 3000, 3600, 4200};

+            QDateTime end;
+            CalcState calcState;
+            QDateTime s(QDateTime::currentDateTime());
+
+            s.setTime(QTime(18, 0, 0));
+            calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                (double)600, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+            qCritical() << end.toString(Qt::ISODate);
+            qCritical() << calcState.toString();
+#if 0

            for (int i=0; i<timeSteps.size(); ++i) {
                int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
@@ -882,89 +909,66 @@ int main() {
                            << "(price so far:" << price << ")";

            }
+#endif
        }
        if (zone == 3) {
-            int price;
-            QDateTime productStart;
-            QDateTime productEnd;
-            QDateTime start = QDateTime::currentDateTime();
+            //QDateTime xx(QDateTime::fromString("2024-07-31T00:00:00", Qt::ISODate));
+            //xx = xx.addSecs(-60); // -->  "2024-07-30T23:59:00"
+            //qCritical() << xx.toString(Qt::ISODate);
+
+            //QDateTime s(QDateTime::currentDateTime());
+            //s.setTime(QTime(12, 0, 0));
+            //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, s);
+            //qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+
+            if (paymentOptionIndex != 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            //QSet<uint32_t> const prices1{800, 1600, 2400, 3200, 4000, 4800, 5600};
+            //QSet<uint32_t> const prices2{500, 1600, 2400, 3200, 4000, 4800, 5600};
+
+            QDateTime end;
+            CalcState calcState;
+
+            QDateTime s(QDateTime::currentDateTime());
+            s.setTime(QTime(12, 0, 0));
+
+            int minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                                 paymentOptionIndex, s);

 #if 0
-            start.setTime(QTime(0, 0, 0));
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
-            qCritical() << QString("line=%1 price (%2) :")
-                           .arg(__LINE__)
-                           .arg(start.time().toString(Qt::ISODate)) << price;
+            qCritical() << "minimal parking price" << minimal_parking_price;

-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            start.setTime(QTime(14, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__)
-                        << price;
-
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
-            qCritical() << QString("line=%1 price:").arg(__LINE__) << price;
-
-            start.setTime(QTime(15, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            start.setTime(QTime(16, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            start.setTime(QTime(17, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            //price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            //qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            //price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET);
-            //qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+            for (int i = 0; i < 8; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)minimal_parking_price + i*800,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
+            }

 #else
-            for (int h = 0; h < 24; ++h) {
-                start.setTime(QTime(h, 0, 0));
-                productStart = productEnd = QDateTime();
-                price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-                qCritical() << QString("line=%1 %2 price (%3-%4) :")
-                               .arg(__LINE__)
-                               .arg(start.time().toString(Qt::ISODate))
-                               .arg(productStart.time().toString(Qt::ISODate))
-                               .arg(productEnd.time().toString(Qt::ISODate))
-                            << price;
+            s.setTime(QTime(15, 0, 0));
+
+            minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                             paymentOptionIndex, s);
+
+            qCritical() << "minimal parking price" << minimal_parking_price;
+
+            for (int i = 0; i < 8; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)minimal_parking_price + i*800,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
            }
 #endif
        }
@@ -1376,7 +1380,7 @@ int main() {
    int pop_carry_over;
    int pop_carry_over_time_range_id;

-    for (int zone=1; zone < 2; ++zone) {
+    for (int zone=2; zone < 3; ++zone) {
    //for (int t=6; t < 7; t+=20) {
        switch (zone) {
        case 1: {
@@ -1385,6 +1389,7 @@ int main() {
            //pop_max_time = 6*60;
        } break;
        case 2: {
+            qCritical() << "        ZONE 2: KURZZEIT 1";
            // kuzzeit-1-tarif
            input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
            //pop_max_time = 5*60;
@@ -1427,6 +1432,7 @@ int main() {
        cout << endl;

        if (isParsed) {
+
            // test library functions

            if (zone == 1) {
@@ -1453,10 +1459,10 @@ int main() {
                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
                qCritical() << "TimeSteps" << timeSteps;

-                if (stepsConfigured != timeSteps) {
-                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
-                    return -1;
-                }
+                //if (stepsConfigured != timeSteps) {
+                //    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                //    return -1;
+                //}

                QDateTime start = QDateTime::currentDateTime();

@@ -1464,7 +1470,8 @@ int main() {
                double price1 = 0;
                double price2 = 0;

-                for (int m=0; m < 1440; ++m) {
+                //for (int m=0; m < 1440; ++m) {
+                for (int m=480; m < 481; ++m) {
                    start.setTime(QTime(0, 0, 0));
                    start = start.addSecs(m*60);

@@ -1481,11 +1488,11 @@ int main() {
                    //}

                    CalcState cs;
-
+#if 1
                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                        QDateTime end = start.addSecs(timeSteps.at(i)*60);

-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                        if (cs.getStatus() != CalcState::State::SUCCESS) {
                            if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
@@ -1508,7 +1515,7 @@ int main() {
                        }

                        qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "PRICE=" << price1;
+                                    << timeSteps.at(i) << "PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);


                        //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
@@ -1516,6 +1523,21 @@ int main() {
                        //                                                                     cost[i], false, true);
                        //qCritical() << "duration" << duration.c_str();
                    }
+#else
+
+                    double cost = 80;
+                    qCritical() << "START" << start.toString(Qt::ISODate) << "cost" << cost;
+                    QDateTime end;
+
+                    cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        qCritical() << __LINE__ << cs.toString()
+                                    << "START" << start.toString(Qt::ISODate)
+                                    << "<duration" << start.secsTo(end) / 60
+                                    << "cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
+                    //}
+#endif
                }
            } // zone == 1
            if (zone == 2) {
@@ -1553,18 +1575,19 @@ int main() {
                bool fail;
                QDateTime start;

-                for (int i=0; i < 4; ++i) {
+                for (int i=1; i < 2; ++i) {
                    switch (i) {
                    case 0:
                        start = QDateTime(QDate(2024, 5, 1), QTime(16, 0, 0)); // holiday
                        fail = false;
                    break;
                    case 1:
-                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
+                        //start = QDateTime(QDate(2024, 10, 3), QTime(17, 0, 0)); // sunday
+                        start = QDateTime(QDate(2024, 9, 8), QTime(16, 2, 0)); // sunday
                        fail = false;
                    break;
                    case 2:
-                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0)); // monday
+                        start = QDateTime(QDate(2024, 4, 22), QTime(17, 30, 0)); // monday
                        fail = false;
                    break;
                    case 3:
@@ -1588,18 +1611,52 @@ int main() {

                        QList<int>::const_iterator step;
                        for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+                            //qCritical() << __LINE__
+                            //            << "START" << start.toString(Qt::ISODate)
+                            //            << "<duration" << *step;
+
+                            // if (*step != 180)
+                            // continue;
+

                            double cost = 0;
                            CalcState cs;

-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            QDateTime s(start);
+
+                            qCritical() << __LINE__
+                                        << "START" << start.toString(Qt::ISODate)
+                                        << "<duration" << *step;
+
+#if 1
+                            if ((cs = compute_price_for_parking_ticket(&cfg, s, *step, end, &price,
+                                                                       PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                cost = price.netto;
-                                qCritical() << "step" << *step << ": cost" << cost;
+                                qCritical() << __LINE__
+                                            << "START" << start.toString(Qt::ISODate)
+                                            << "<duration" << *step
+                                            << "cost" << cost
+                                            << "> end" << end.toString(Qt::ISODate);
                            } else {
                                if (fail == false) {
                                    qCritical() << "<<<ERROR>>> cs =" << QString(cs);
                                }
                            }
+#else
+                            cost = 200;
+                            qCritical() << "START" << start.toString(Qt::ISODate) << "cost" << cost;
+
+                            cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
+                                                                         PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                                qCritical() << __LINE__ << cs.toString()
+                                            << "START" << start.toString(Qt::ISODate)
+                                            << "<duration" << start.secsTo(end) / 60
+                                            << "cost" << cost
+                                            << "> end" << end.toString(Qt::ISODate);
+                            break;
+                            //}
+#endif
+
                        }
                    } else {
                        qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
@@ -1676,7 +1733,7 @@ int main() {
                            double cost = 0;
                            CalcState cs;

-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                cost = price.netto;
                                qCritical() << "step" << *step << ": cost" << cost;
                            } else {
@@ -1761,7 +1818,7 @@ int main() {
                            double cost = 0;
                            CalcState cs;

-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                cost = price.netto;
                                qCritical() << "step" << *step << ": cost" << cost;
                            } else {
@@ -1819,7 +1876,7 @@ int main() {
                        double cost = 0;
                        CalcState cs;

-                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                            cost = price.netto;
                            qCritical() << "step" << *step << ": cost" << cost;
                        } else {
@@ -1922,7 +1979,7 @@ int main() {
                CalcState cs;
                for (int i = 13, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                    QDateTime end = start.addSecs(timeSteps.at(i)*60);
-                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                    qCritical() << endl;
                }

@@ -1947,7 +2004,7 @@ int main() {
                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                        QDateTime end = start.addSecs(timeSteps.at(i)*60);

-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                        if (cs.getStatus() != CalcState::State::SUCCESS) {
                            if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
--- a/main/main.pro
+++ b/main/main.pro
@@ -30,7 +30,11 @@ SOURCES += main.cpp
 # HEADERS +=

 OTHER_FILES += \
-    /home/linux/customer_505/etc/psa_tariff/tariff01.json
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json
Author	SHA1	Message	Date
Gerhard Hoffmann	7c0514e241	save current state	2024-09-13 10:42:45 +02:00
Gerhard Hoffmann	f53e9ceaae	Some testing added	2024-09-11 12:11:49 +02:00
Gerhard Hoffmann	dffc6e2a03	Minor: removed some debug output.	2024-09-11 11:56:06 +02:00
Gerhard Hoffmann	f9cc3af473	ParseJson(): Add parsing of "pop_apply_carry_over_to_ticket_endtime".	2024-09-11 11:55:03 +02:00
Gerhard Hoffmann	9dd0108731	ParseJson(): Add parsing for prepaid-options.	2024-09-11 11:54:16 +02:00
Gerhard Hoffmann	fa10ea4b89	compute_price_for_parking_ticket(): In case parking-time-limit is violated, return with an error. Commented out: use another possiblity: cut max-parking-time so that parking-time-limit is not violated.	2024-09-11 11:49:31 +02:00
Gerhard Hoffmann	05f03a623b	compute_price_for_parking_ticket(): If after crossing a carry-over-time range (taking several days) check if we have to carry over again on the target day.	2024-09-11 11:47:50 +02:00
Gerhard Hoffmann	03e9076962	compute_price_for_parking_ticket(): Minor: add some debug output.	2024-09-11 11:46:36 +02:00
Gerhard Hoffmann	5dbd3645c6	compute_price_for_parking_ticket(): Fetch prepaid-option-id (possibly recalculating it depending on year-period), and fetch associated prepaid-options.	2024-09-11 11:44:09 +02:00
Gerhard Hoffmann	d21f69cb9b	get_maximal_parkingprice(): Fetch maxPrice directly instead of using utility function.	2024-09-11 11:42:15 +02:00
Gerhard Hoffmann	e38a1bfe12	Add default constructor, update debug output.	2024-09-11 11:40:19 +02:00
Gerhard Hoffmann	f38a8d528c	Minor: add getters for parking-time-limit.	2024-09-11 11:39:16 +02:00
Gerhard Hoffmann	08a593eb12	Add 'pop_apply_carry_over_to_ticket_endtime': If ticket-end-time exactly hits the start of a carry-over-time-range, the move to the end of the carry-over-time-range, even if this were not strictly necessary.	2024-09-11 11:36:57 +02:00
Gerhard Hoffmann	f322d30e36	Add default constructor, fix debug output.	2024-09-11 11:35:17 +02:00
Gerhard Hoffmann	7a53a68850	getPaymentOptionIndex(): add start-time parameter	2024-09-06 12:05:41 +02:00
Gerhard Hoffmann	275c3ec869	compute_price_for_parking_ticket(): Pass start-date-time to parking-time-checker.	2024-09-03 11:19:23 +02:00
Gerhard Hoffmann	6d2bde1fe9	getPaymentOptionIndex(): Fix: make sure only one payment option can be chosen.	2024-09-03 11:17:31 +02:00
Gerhard Hoffmann	f02521d3c2	parseWeekDay(): for the park-time-limit checking take into account that the start-date-time and end-date-time are on different days.	2024-09-03 11:15:08 +02:00
Gerhard Hoffmann	75f1c1bb76	Checking parking-time-limit: provide start-date-time as well, because the limit counts only from one day to following day (e.g. Sunday to Monday or from holiday to next day).	2024-09-03 11:10:24 +02:00
Gerhard Hoffmann	f47695de8b	Add pop_plus_steps_saved	2024-09-02 17:16:47 +02:00
Gerhard Hoffmann	cce3db301b	Minor: comment out some code to prevent compiler warnings (about some unused variables).	2024-09-02 17:15:33 +02:00
Gerhard Hoffmann	5cab0de9fb	Use free function getPaymentOptionIndex() to compute index of valid payment-option-section in tariff-file based on configured businessHours.	2024-09-02 17:14:20 +02:00
Gerhard Hoffmann	f92906f680	Minor: debug output.	2024-09-02 17:13:11 +02:00
Gerhard Hoffmann	8cdeef26fc	Check if computed ticket-end-time violates a carry-over-limit defined in tariff-file.	2024-09-02 17:11:48 +02:00
Gerhard Hoffmann	52ebbf7bc9	Use free function getPaymentOptionIndex() in serveral places to compute valid index of a payment-option-section within tariff file. If this is not possible, then try the already available functionality.	2024-09-02 17:09:26 +02:00
Gerhard Hoffmann	349e9d8b06	Add free functions isHoliday() to check if the current day is a holiday and previousDayHoliday() to check if previous day (relative to endtime) is a holiday.	2024-09-02 17:05:32 +02:00
Gerhard Hoffmann	68a1c24861	Add free function getPaymentOptionIndex(): Compute payment option index base on current start-date-time and businesshour-setiing in tariff-file. Returns -1 to indicate error.	2024-09-02 17:03:37 +02:00
Gerhard Hoffmann	c946c106d1	Configuration::ParseJson(): Save the pop_plus_steps setting: sometimes it is necessary to adapt the pop_plus_steps-variable in order to hit a time-limit-boundary exactly. Otherwise the next computed time-step might overshoot the time-limit, and when moving backwards (via Minus-Button) there is a better resolution: going backwards, the user could hit the exact time-limit, which he could not when going up.	2024-09-02 16:58:34 +02:00
Gerhard Hoffmann	f24f1fe646	Configuration::ParseJson(): Call parseWeekDay() to reading the week-day-settings.	2024-09-02 16:57:11 +02:00
Gerhard Hoffmann	c6b8a37263	ParseJson(): Minor: some reformatting of source code.	2024-09-02 16:55:48 +02:00
Gerhard Hoffmann	58d8f16681	ParseWeekDay(): Parsing "Monday" - "Sunday" section i a tariff-file. Each day has a memebr named "week_day_default". It contains the valid default tariff settings for a usual day (i.e. no holiday etc.) It also contains the carry-over-settings for the usual day. In case there is some holiday on this day (for instance on "Monday"), the the date of the holiday replaces the name "week_day_default". Otherwise the structure is the same as for a usual day.	2024-09-02 16:49:21 +02:00
Gerhard Hoffmann	431664d8b9	IdentifyJsonMember(): Add "Monday" - "Sunday" as level-1 sections in a tariff-file.	2024-09-02 16:47:46 +02:00
Gerhard Hoffmann	53cf9a7341	Add description for tariff-settings.w	2024-09-02 16:46:00 +02:00
Gerhard Hoffmann	3a18ee2d7c	Add description for carry-over-settings	2024-09-02 16:45:35 +02:00
Gerhard Hoffmann	929a8a4a27	Reuse of "class ATBWeekDays": Description of a weekday: Mon-Sun. For holidays contains a type-flag to indicate such a day. Each weekday has some tariff-settings and some carry-over-settings.	2024-09-02 16:41:26 +02:00
Gerhard Hoffmann	2b9657787d	add tests for bad-neuenahr	2024-09-02 16:40:38 +02:00
Gerhard Hoffmann	eca285cc25	remove obsolete print-function	2024-09-02 16:40:07 +02:00
Gerhard Hoffmann	bda8914f1a	Add free functions: previousDayHoliday(): Check if previous day was a holiday. Check is done relative to computed endtime. isHoliday(): Check if startDateTime is on a holiday. getPaymentOptionIndex(): Compute the index of the payment-options-section inside a tariff-file. This is done as workaround (and backward compatibility). parseWeekDay(): Parse new structure of tariff-file.	2024-09-02 16:35:25 +02:00
Gerhard Hoffmann	a3983ed427	check for time-step-config == STATIC	2024-08-21 17:46:35 +02:00
Gerhard Hoffmann	f8805e9e78	compute_duration_for_parking_ticket(): Fix: handle carry-over for coin-insertion.	2024-08-21 15:40:55 +02:00
Gerhard Hoffmann	7a6360f392	compute_duration_for_parking_ticket(): Fix: handle prepaid-setting for coin-insertion.	2024-08-21 15:39:44 +02:00
Gerhard Hoffmann	08a249f393	return OVERPAID in case overpay is not allowed	2024-08-21 15:39:05 +02:00
Gerhard Hoffmann	7c173ae292	parse for pop_allow_overpay	2024-08-21 15:38:06 +02:00
Gerhard Hoffmann	80637260f3	Utilities::IsYearPeriodActive(): Fix: take into account if start-date <= end-date or not. Otherwise check is wrong, and no valid year period is returned.	2024-08-21 15:35:03 +02:00
Gerhard Hoffmann	9b524d63e5	Add 'pop_allow_overpay' setting: set vai tariff-file if operpay is allowed.	2024-08-21 15:33:02 +02:00
Siegfried Siegert	25b3143d88	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 14:37:42 +02:00
Gerhard Hoffmann	0856f10ca9	GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.	2024-08-02 14:34:44 +02:00
Siegfried Siegert	88c703ecc2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 13:21:54 +02:00
Gerhard Hoffmann	465b2274a1	compute_duration_for_parking_ticket(): Adapt end-time in case it is midnight: 00:00 -> 23:59	2024-08-02 13:15:11 +02:00
Siegfried Siegert	f946cd13e4	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:55:12 +02:00
Siegfried Siegert	8d1cbe7337	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:29:10 +02:00
Gerhard Hoffmann	62c52fd580	test case for fuchs, fane alm.	2024-08-02 11:13:50 +02:00
Gerhard Hoffmann	1023f6ede1	GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.	2024-08-02 11:12:07 +02:00
Gerhard Hoffmann	36b3e85d1b	GetCostFromDuration(): recompute timestep list to make sure that time step is found in it.	2024-08-02 11:11:20 +02:00
Gerhard Hoffmann	b394ed46cc	In case end-parking-time ends with 00:00, set it to 23:59.	2024-08-02 11:09:20 +02:00
Gerhard Hoffmann	3dda2d8355	Check if prepaid-option is set.	2024-08-02 11:08:52 +02:00
Gerhard Hoffmann	1152c3824e	Minor: add some debug output.	2024-08-02 11:08:32 +02:00
Gerhard Hoffmann	4271c0fb31	Fixed compute_next_timestep() for degressive tariff: compute_next_timestep() was actually never called for such a tariff.	2024-08-02 10:50:25 +02:00
Gerhard Hoffmann	24d9d4a0ff	test case for kleipeda and fuchs	2024-08-01 16:46:09 +02:00
Gerhard Hoffmann	4bce854d77	GetDurationFromCost(): Set durationInSecs in case 'pop_accumulate_prices' is not configured in tariff file.	2024-08-01 16:44:06 +02:00
Gerhard Hoffmann	138221759b	GetDurationFromCost(): Minor: removed some debug ouput	2024-08-01 16:43:19 +02:00
Gerhard Hoffmann	9cb7d4aea6	compute_price_for_parking_ticket(): Added handling for prepaid and carry-over.	2024-08-01 16:04:57 +02:00
Gerhard Hoffmann	cde490bab2	compute_next_time_step(): Added handling with pop_plus_steps/pop_minus_steps: '+' usually takes more than one time step. '-' is usually 1. Changed behaviour when current time is not found in the list of time steps: Search for the entry with the smallest distance to 'current time'. If the distance is smaller than 3 minutes, then use 'current time' as new entry in the list of time steps.	2024-08-01 16:00:10 +02:00
Gerhard Hoffmann	f0677374ec	Parsing of pop_plus_steps/pop_minus_steps	2024-08-01 15:46:49 +02:00
Gerhard Hoffmann	89b05ffadc	Added GetYearPeriodActive() to get active year period.	2024-08-01 15:45:50 +02:00
Gerhard Hoffmann	260973cd09	Added pop_plus_steps/pop_minus_steps to control step sizes	2024-08-01 15:44:06 +02:00
Siegfried Siegert	3a98a14eb0	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-31 10:50:03 +02:00
Gerhard Hoffmann	7bf7108668	GetDurationFromCost(): Check if computed duration is below minimal parking time.	2024-07-31 10:26:47 +02:00
Gerhard Hoffmann	e5629ba4fd	GetDurationFromCost(): Check if given price is below minimal parking price.	2024-07-31 10:25:03 +02:00
Siegfried Siegert	0d0d34cb87	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-31 08:06:45 +02:00
Gerhard Hoffmann	e4cb992aae	GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).	2024-07-30 15:39:55 +02:00
Gerhard Hoffmann	cdeb625a15	Minor: Revode debug output.	2024-07-30 15:39:35 +02:00
Gerhard Hoffmann	589d89b73a	Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).	2024-07-30 15:37:28 +02:00
Gerhard Hoffmann	7536f89d75	compute_duration_for_parking_ticket(): read prepaid-setting from tariff-file, if possible.	2024-07-30 15:32:58 +02:00
Gerhard Hoffmann	9a6b2b195d	get_minimal_parking_price(): compute this price dynamically according to settings in the tariff-file. Introduced for Fuchs (500) for Valser Alm (Location: Fane)	2024-07-30 15:29:47 +02:00
Gerhard Hoffmann	7233bc55c2	test for valser alm (fane)	2024-07-30 15:24:52 +02:00
Siegfried Siegert	8fff7a76f6	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-30 10:02:57 +02:00
Gerhard Hoffmann	52b7c2390a	Minor: introduce using-typedef for Duration	2024-07-29 17:33:49 +02:00
Gerhard Hoffmann	894e23332f	compute option index using permit type.	2024-07-29 17:32:15 +02:00
Gerhard Hoffmann	fbc255a6f2	Fix: compute_next_time_step(): removed check for product ids.	2024-07-29 17:31:33 +02:00
Gerhard Hoffmann	24ab01695d	GetPriceForTimeStep(): remove default parameter.	2024-07-29 17:28:27 +02:00
Gerhard Hoffmann	37652d3b6a	Save computed pop_min_time.	2024-07-29 17:27:16 +02:00
Gerhard Hoffmann	14fd7ddd39	Preperationf for Zone3.	2024-07-29 17:26:53 +02:00
Gerhard Hoffmann	ca3c3921d4	Minor: change debug output	2024-07-29 17:26:26 +02:00
Gerhard Hoffmann	37620a06c1	added test case for bus	2024-07-29 11:30:36 +02:00
Gerhard Hoffmann	9f4affca5a	Minor: removed debug output	2024-07-29 11:30:00 +02:00
Gerhard Hoffmann	4f2c33cdc2	Minor: added comments and added some debug output.	2024-07-29 11:28:07 +02:00
Gerhard Hoffmann	3cd02296b0	compute_duration_for_parking_ticket(): Fix: pass PERMIT_TYPE explicitly to correct arity of GetDurationFromCost().	2024-07-29 11:25:12 +02:00
Gerhard Hoffmann	f1493f417f	get_maximal_parkingprice(): implement for SHORT_TERM_PARKING_BUS and SHORT_TERM_PARKING_PKW.	2024-07-29 11:24:05 +02:00
Gerhard Hoffmann	356e3be178	Pass PERMIT_TYPE to get_minimal_parkingtime() and get_maximal_parkingtime() to override default parameter value.	2024-07-29 11:22:22 +02:00
Gerhard Hoffmann	31b1dd1690	ResetTimeSteps(): Check paymentOptionIndex for correct value.	2024-07-29 11:20:00 +02:00
Siegfried Siegert	84d807930e	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 17:35:38 +02:00
Gerhard Hoffmann	dbf5b1f11d	remove input correction	2024-07-26 17:34:24 +02:00
Siegfried Siegert	18f4e74eea	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 17:05:45 +02:00
Gerhard Hoffmann	29368ea850	Remove correction	2024-07-26 17:04:33 +02:00
Gerhard Hoffmann	b84f80887e	Checkin for testing	2024-07-26 17:01:44 +02:00
Siegfried Siegert	bfd9f3b80c	Fix: add missing parameter PermitType	2024-07-26 14:11:37 +02:00
Siegfried Siegert	cb69d3ca2f	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:35:56 +02:00
Gerhard Hoffmann	4a2b15d086	Add some debug output into GetDurationForPrice().	2024-07-26 13:34:18 +02:00
Siegfried Siegert	63043931c2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:12:56 +02:00
Gerhard Hoffmann	8dad8f00e8	GetPriceForTimeStep(): Fix: user default payment option	2024-07-26 13:11:29 +02:00
Siegfried Siegert	1ea03f522c	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:01:17 +02:00
Gerhard Hoffmann	805a732c52	GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.	2024-07-26 12:53:42 +02:00