Fix: copy header files

Recompute pop_max_price using netto-parking-time.
	Search Duration for the time-step with time-step == netto-parking-time,
	then search for the corresponding price in PaymentRate.
	The result is the new pop_max_price.

library/include/mobilisis/atb_time.h

@@ -0,0 +1,59 @@
+#ifndef ATB_TIME_H_INCLUDED
+#define ATB_TIME_H_INCLUDED
+
+#include <QDateTime>
+
+class ATBTime {
+    QDateTime const m_end;
+    mutable QDateTime m_time;
+
+public:
+    explicit ATBTime();
+    explicit ATBTime(int h, int m, int s = 0, int ms = 0);
+    explicit ATBTime(QString const &time);
+
+    int hour() const { return m_time.time().hour(); }
+    int minute() const { return m_time.time().minute(); }
+    int second() const { return m_time.time().second(); }
+    int msec() const { return m_time.time().msec(); }
+
+    int secsTo(QTime t) const { return m_time.time().secsTo(t); }
+    int msecsTo(QTime t) const { return m_time.time().msecsTo(t); }
+
+    bool setHMS(int h, int m, int s, int ms = 0);
+
+    bool isNull() const { return m_time.time().isNull(); }
+    bool isValid() const { return m_time.time().isValid(); }
+
+
+    QTime addMSecs(int ms) const;
+    QTime addMSecs(int ms);
+
+    QTime addSecs(int s) const;
+    QTime addSecs(int s);
+
+    int msecsSinceStartOfDay() const;
+    QString toString(Qt::DateFormat format = Qt::TextDate) const;
+
+
+    static bool isValid(int h, int m, int s, int ms = 0);
+
+    static QTime currentTime() { return QDateTime::currentDateTime().time(); }
+
+    static constexpr QTime fromMSecsSinceStartOfDay(int msecs);
+
+    static QTime fromString(QString const &string, Qt::DateFormat format = Qt::TextDate);
+    static QTime fromString(QString const &string, const QString &format);
+
+    friend bool operator!=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator>(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend QDataStream &operator<<(QDataStream &out, ATBTime time);
+    friend QDataStream &operator>>(QDataStream &in, ATBTime &time);
+};
+
+
+#endif // ATB_TIME_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -56,6 +56,7 @@ struct CALCULATE_LIBRARY_API CalcState {
     static QString const ABOVE_MAX_PARKING_PRICE;
     static QString const OVERPAID;
     static QString const OUTSIDE_ALLOWED_PARKING_TIME;
+    static QString const SUCCESS_MAXPRICE;
 
     enum class State : uint8_t {
         SUCCESS,
@@ -71,7 +72,8 @@ struct CALCULATE_LIBRARY_API CalcState {
         BELOW_MIN_PARKING_PRICE,
         ABOVE_MAX_PARKING_PRICE,
         OVERPAID,
-        OUTSIDE_ALLOWED_PARKING_TIME
+        OUTSIDE_ALLOWED_PARKING_TIME,
+        SUCCESS_MAXPRICE
     };
 
     State m_status;
@@ -106,6 +108,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::SUCCESS:
             s = CalcState::SUCCESS;
             break;
+        case State::SUCCESS_MAXPRICE:
+            s = CalcState::SUCCESS_MAXPRICE;
+            break;
         case State::ERROR_PARSING_ZONE_NR:
             s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
@@ -158,6 +163,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::SUCCESS:
             s = CalcState::SUCCESS;
             break;
+        case State::SUCCESS_MAXPRICE:
+            s = CalcState::SUCCESS_MAXPRICE;
+            break;
         case State::ERROR_PARSING_ZONE_NR:
             s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
@@ -207,6 +215,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         if (desc == SUCCESS) {
             m_status = State::SUCCESS;
         } else
+        if (desc == SUCCESS_MAXPRICE) {
+            m_status = State::SUCCESS_MAXPRICE;
+        }
         if (desc == ERROR_PARSING_ZONE_NR) {
             m_status = State::ERROR_PARSING_ZONE_NR;
         } else

library/include/mobilisis/calculator_functions.h

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <optional>
+#include <utility>
 
 #include "configuration.h"
 #include "calculate_price.h"
@@ -70,8 +71,9 @@ 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>
-                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
+        GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+                            PermitType permitType, bool nextDay = false, bool prepaid = false);
 
 	/// <summary>
 	///  Gets cost from duration in seconds

library/include/mobilisis/configuration.h

@@ -130,7 +130,7 @@ private:
 
 bool previousDayHoliday(Configuration const &cfg, QDateTime const &t);
 bool isHoliday(Configuration const &cfg, QDateTime const &t);
-int getPaymentOptionIndex(Configuration const &cfg);
+int getPaymentOptionIndex(Configuration const &cfg, QDateTime const& dt = QDateTime::currentDateTime());
 
 ATBWeekDay parseWeekDay(Configuration &cfg,
                         rapidjson::GenericMemberIterator<false,

library/include/mobilisis/payment_opt.h

@@ -25,6 +25,7 @@ public:
         pop_max_time = 0;
         pop_min_price = 0;
         pop_max_price = 0;
+        pop_max_price_save = 0;
         pop_carry_over = -1;
         pop_carry_over_option_id = -1;
         pop_prepaid_option_id = -1;
@@ -44,6 +45,7 @@ public:
         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;
@@ -60,6 +62,7 @@ public:
     double pop_max_time;
     double pop_min_price;
     double pop_max_price;
+    double pop_max_price_save;
     int pop_carry_over;
     int pop_carry_over_option_id;
     bool pop_truncate_last_interpolation_step;
@@ -77,6 +80,7 @@ public:
     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;

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
 };

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";
 

library/include/mobilisis/tariff_carryover_settings.h

@@ -10,7 +10,9 @@ struct ATBTariffCarryOverSettings {
 
     // parking time limit not violated: return false, otherwise: return true.
     using ParkingTimeLimitChecker = std::function<bool(ATBTariffCarryOverSettings const&,
-                                                       QDateTime const &endTime, int paymentOptionIndex)>;
+                                                       QDateTime const &startTime,
+                                                       QDateTime const &endTime,
+                                                       int paymentOptionIndex)>;
 
     int m_duration;
     QTime m_start;
@@ -24,7 +26,8 @@ struct ATBTariffCarryOverSettings {
       : m_duration(0)
       , m_start(QTime())
       , m_end(QTime())
-      , m_parkingTimeLimitChecker([](ATBTariffCarryOverSettings const&, QDateTime const &, int) { return false; })
+      , m_parkingTimeLimitChecker([](ATBTariffCarryOverSettings const&,
+                                  QDateTime const&, QDateTime const&, int) { return false; })
       , m_parking_time_limit(QTime())
       , m_about_to_exceed_parking_time_limit(QTime()) {}
 
@@ -41,10 +44,15 @@ struct ATBTariffCarryOverSettings {
       , m_about_to_exceed_parking_time_limit(about_to_exceed_parking_time_limit) {
     }
 
-    bool parkingTimeLimitExceeded(QDateTime const &endTime, int paymentOptionIndex) const {
+    bool parkingTimeLimitExceeded(QDateTime const &startTime,
-        return m_parkingTimeLimitChecker(*this, endTime, paymentOptionIndex);
+                                  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);
 

library/include/mobilisis/tariff_prepaid.h

@@ -4,14 +4,37 @@
 #include <QTime>
 #include <QString>
 
+#include "atb_time.h"
+
 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 +43,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;
     }

library/library.pro

@@ -35,7 +35,8 @@ SOURCES += \
     src/tariff_log.cpp \
     src/calculate_price.cpp \
     src/ticket.cpp \
-    src/tariff_global_defines.cpp
+    src/tariff_global_defines.cpp \
+    src/atb_time.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -89,7 +90,8 @@ HEADERS += \
     include/mobilisis/tariff_interpolation.h \
     include/mobilisis/tariff_prepaid.h \
     include/mobilisis/tariff_carryover.h \
-    include/mobilisis/tariff_global_defines.h
+    include/mobilisis/tariff_global_defines.h \
+    include/mobilisis/atb_time.h
 
 OTHER_FILES += src/main.cpp \
     ../tariffs/tariff_korneuburg.json \

library/src/atb_time.cpp

@@ -0,0 +1,115 @@
+#include "atb_time.h"
+
+
+ATBTime::ATBTime()
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00", Qt::ISODate))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00", Qt::ISODate)) {
+}
+
+ATBTime::ATBTime(int h, int m, int s, int ms)
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00", Qt::ISODate))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00", Qt::ISODate)) {
+
+    QTime t(h, m, s, ms);
+    m_time.setTime(t);
+}
+
+ATBTime::ATBTime(QString const &t)
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00"))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00")) {
+
+    if (t == "24:00:00") {
+        m_time = m_end;
+    } else {
+        m_time.setTime(QTime::fromString(t, Qt::ISODate));
+    }
+}
+
+
+QTime ATBTime::addMSecs(int ms) const {
+    return m_time.time().addMSecs(ms);
+}
+
+QTime ATBTime::addMSecs(int ms)  {
+    QTime t = m_time.time();
+    t = t.addMSecs(ms);
+    m_time.setTime(t);
+    return t;
+}
+
+QTime ATBTime::addSecs(int s) const {
+    return m_time.time().addSecs(s);
+}
+
+QTime ATBTime::addSecs(int s)  {
+    QTime t = m_time.time();
+    t = t.addSecs(s);
+    m_time.setTime(t);
+    return t;
+}
+
+constexpr QTime ATBTime::fromMSecsSinceStartOfDay(int msecs) {
+    return QTime::fromMSecsSinceStartOfDay(msecs);
+}
+
+QTime ATBTime::fromString(QString const &string, Qt::DateFormat format) {
+    return QTime::fromString(string, format);
+}
+
+QTime ATBTime::fromString(QString const &string, QString const &format) {
+    return QTime::fromString(string, format);
+}
+
+bool ATBTime::isValid(int h, int m, int s, int ms) {
+    return QTime(h, m, s, ms).isValid();
+}
+
+int ATBTime::msecsSinceStartOfDay() const {
+    return m_time.time().msecsSinceStartOfDay();
+}
+
+bool ATBTime::setHMS(int h, int m, int s, int ms) {
+    if (isValid(h, m, s, ms)) {
+        QTime t(h, m, s, ms);
+        m_time.setTime(t);
+        return true;
+    }
+    return false;
+}
+
+QString ATBTime::toString(Qt::DateFormat format) const {
+    return m_time.time().toString(format);
+}
+
+bool operator!=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() != rhs.m_time.time();
+}
+
+bool operator<=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() <= rhs.m_time.time();
+
+}
+
+bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() < rhs.m_time.time();
+}
+
+bool operator>(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() > rhs.m_time.time();
+}
+
+bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() == rhs.m_time.time();
+}
+
+QDataStream &operator<<(QDataStream &out, ATBTime time) {
+    out << time.m_time.time();
+    return out;
+}
+
+QDataStream &operator>>(QDataStream &in, ATBTime &time) {
+    QTime t;
+    in >> t;
+    time.m_time.setTime(t);
+    return in;
+}

library/src/calculate_price.cpp

@@ -26,6 +26,7 @@ QString const CalcState::BELOW_MIN_PARKING_PRICE = "BELOW_MIN_PARKING_PRICE";
 QString const CalcState::ABOVE_MAX_PARKING_PRICE = "ABOVE_MAX_PARKING_PRICE";
 QString const CalcState::OVERPAID = "OVERPAID";
 QString const CalcState::OUTSIDE_ALLOWED_PARKING_TIME = "OUTSIDE_ALLOWED_PARKING_TIME";
+QString const CalcState::SUCCESS_MAXPRICE = "SUCCESS_MAXPRICE";
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
@@ -76,6 +77,7 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
     if (paymentOptionIndex == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
     }
+
     int maxTime = 0;
 
     switch(permitType) {
@@ -101,7 +103,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    QDateTime const &start) {
     int minPrice = -1;
 
-    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg)) == -1) {
+    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg, start)) == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
     }
 
@@ -337,7 +339,9 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
     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
@@ -669,11 +673,20 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     CalcState calcState;
 
-    int paymentOptionIndex = getPaymentOptionIndex(*tariff);
+    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());
     }
 
+    tariff->getPaymentOptions(paymentOptionIndex).pop_max_price
+        = tariff->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
+
     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;
 
@@ -700,11 +713,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         return calcState.set(CalcState::State::SUCCESS);
     }
 
-    QDate const d(1970, 1, 1);
+    //QDate const d(1970, 1, 1);
-    QTime const t(0, 0, 0);
+    //QTime const t(0, 0, 0);
-    QDateTime start(d, t, Qt::UTC);
+    //QDateTime start(d, t, Qt::UTC);
-    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    //start = start.toLocalTime().addSecs(start_parking_time * 60);
-    QDateTime end(start);
+    //QDateTime end(start);
     if (start.isValid()) {
         double cost = Calculator::GetInstance().GetCostFromDuration(
                     tariff,
@@ -739,11 +752,14 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     QDateTime start_parking_time(start_parking_time_);
 
-    int paymentOptionIndex = getPaymentOptionIndex(*tariff);
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
     if (paymentOptionIndex == -1) {
         paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
     }
 
+    tariff->getPaymentOptions(paymentOptionIndex).pop_max_price
+        = tariff->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
+
     double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
     double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
 
@@ -797,69 +813,153 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
             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;
+            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;
-                qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_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;
             }
 
-            QTime const carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+            QTime carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-            int const carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+            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__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
+            qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+
+
+            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
-            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";
+                    qCritical() << __func__ << ":" << __LINE__ << "prepaid: no";
                 } else {
-                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
+                    qCritical() << __func__ << ":" << __LINE__ << "    prepaidStart" << p.prepaid[weekDay].static_start.toString(Qt::ISODate);
-                        effectiveStartTime.setTime(p.static_end);
+                    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.static_start) {   // static_start: e.g. 22:00:00
+                    if (start_parking_time.time() > p.prepaid[weekDay].static_start) {   // static_start: e.g. 22:00:00
-                        effectiveStartTime.setTime(p.static_start);
+                        effectiveStartTime.setTime(p.prepaid[weekDay].static_start);
                     }
                 }
             }
 
-            // handle carry over
+            effectiveStartTime.setTime(QTime(effectiveStartTime.time().hour(),
-            int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
+                                             effectiveStartTime.time().minute(), 0));
-            if (netto_parking_time > minutesUntilCarryOver) {
+
-                int const rest = netto_parking_time - minutesUntilCarryOver;
+            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:" << effectiveStartTime.toString(Qt::ISODate);
-                QDateTime s(effectiveStartTime);
+
-                s = s.addSecs(minutesUntilCarryOver * 60);
+            int const carryOver = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over;
-                s = s.addSecs(carryOverDuration * 60);
+
-                end_parking_time = s.addSecs(rest * 60);
+            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 ((minutesUntilCarryOver > 0) && (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;
-            weekDay = end_parking_time.date().dayOfWeek();
 
             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(end_parking_time, paymentOptionIndex);
+                bool const parkTimeLimitViolated = wd.getTariffCarryOverSettings().parkingTimeLimitExceeded(effectiveStartTime,
+                                                                                                            end_parking_time,
+                                                                                                            paymentOptionIndex);
                 if (parkTimeLimitViolated) {
+                    //QTime const &tlimit = wd.getTariffCarryOverSettings().parkingTimeLimit();
+                    //end_parking_time.setTime(tlimit);
+
+                    // max_price neu berechnen
+
                     calcState.setDesc(QString("line=%1 endTime=%2: park-time-limit violated").arg(__LINE__)
-                                      .arg(end_parking_time.time().toString(Qt::ISODate)));
+                                        .arg(end_parking_time.time().toString(Qt::ISODate)));
                     return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
                 }
             }
-
         } else {
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
@@ -912,7 +1012,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         QString cs = start.toString(Qt::ISODate);
 
         bool prepaid = true;
-        int paymentOptionIndex = getPaymentOptionIndex(*tariff);
+        int paymentOptionIndex = getPaymentOptionIndex(*tariff, start);
+        qCritical() << " payment option index: " << paymentOptionIndex;
         if (paymentOptionIndex == -1) {
             paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
         }
@@ -930,10 +1031,14 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "           start (cs): " << cs;
         qCritical() << "                price: " << price;
 
-        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
+        std::pair<std::string, QDateTime> p_duration
-                                                  tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
+                = Calculator::GetInstance().GetDurationFromCost(tariff,
-                                                  cs.toLocal8Bit().constData(),
+                    tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
-                                                  price, permitType, nextDay, prepaid).c_str();
+                                              cs.toLocal8Bit().constData(),
+                                              price, permitType, nextDay, prepaid);
+        duration = p_duration.first.c_str();
+
+
         QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
         if (!d.isValid()) {
             calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -957,7 +1062,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 
     bool prepaid = true;
 
-    int paymentOptionIndex = getPaymentOptionIndex(*tariff);
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
+    qCritical() << __func__ << ":" << __LINE__ << "payment option index: " << paymentOptionIndex;
     if (paymentOptionIndex == -1) {
         paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
     }
@@ -985,6 +1091,10 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
             // handle prepaid option
             QDateTime effectiveStartTime(start_parking_time);
+
+            effectiveStartTime.setTime(QTime(effectiveStartTime.time().hour(),
+                                             effectiveStartTime.time().minute(), 0));
+
             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()) {
@@ -1001,17 +1111,29 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                 }
             }
         }
+        QDateTime start(start_parking_time);
+        start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
+        QString cs = start.toString(Qt::ISODate);
 
-        QString cs = start_parking_time.toString(Qt::ISODate);
+        std::pair<std::string, QDateTime> p_endTime
-        QString endTime = Calculator::GetInstance().GetDurationFromCost(
+                = Calculator::GetInstance().GetDurationFromCost(
                     tariff,
                     tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
-                    price, permitType, nextDay, prepaid).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"));
             calcState.setStatus(endTime);
+            qCritical() << __func__ << ":" << __LINE__ << "SUCCESS";
+        } else
+        if (endTime == CalcState::SUCCESS_MAXPRICE) {
+            calcState.setDesc(QString("SUCCESS_MAXPRICE"));
+            calcState.setStatus(endTime);
+            qCritical() << __func__ << ":" << __LINE__ << "SUCCESS_MAXPRICE";
         } else
         if (endTime == CalcState::ERROR_PARSING_ZONE_NR) {
             calcState.setStatus(endTime);
@@ -1069,8 +1191,14 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         } else {
             ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
+            ticketEndTime.setTime(QTime(ticketEndTime.time().hour(),
+                                        ticketEndTime.time().minute(), 0));
+
+            int netto_parking_time = start_parking_time.secsTo(ticketEndTime) / 60;
+
             qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
             qCritical() << __func__ << ":" << __LINE__ << "step-config:" << pop_time_step_config;
+            qCritical() << __func__ << ":" << __LINE__ << "netto-parking-time" << netto_parking_time;
 
             if (!ticketEndTime.isValid()) {
                 calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
@@ -1112,10 +1240,25 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                 }
 
                 if (carryOverStart.isValid() && carryOverEnd.isValid() && carryOverDuration != -1) {
+
+                    // note: in such a case (direct coins) carry-over has been handled
+                    // already in GetDurationFromCost()
+                    netto_parking_time -= carryOverDuration;
+                    qCritical() << __func__ << ":" << __LINE__ << "netto-parking-time" << netto_parking_time;
+
                     // 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
+                    if (ticketEndTime.time() == carryOverStart) {
+                        qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.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) {
+                            ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                            qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        }
                     } else {
                         // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
                         if (ticketEndTime.time() < carryOverEnd) {
@@ -1128,18 +1271,85 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                 }
             }
 
-
-            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(ticketEndTime, paymentOptionIndex);
+                bool parkTimeLimitViolated = wd.getTariffCarryOverSettings().parkingTimeLimitExceeded(start_parking_time,
+                                                                                                      ticketEndTime,
+                                                                                                      paymentOptionIndex);
                 if (parkTimeLimitViolated) {
+                    //QTime const &tlimit = wd.getTariffCarryOverSettings().parkingTimeLimit();
+                    //ticketEndTime.setTime(tlimit);
+
+                    QList<int> const &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+
+                    QDateTime newTicketEndTime = ticketEndTime;
+
+                    qCritical() << __func__ << ":" << __LINE__ << "PARK-TIME VIOLATED";
+
+                    for (int i = stepList.size() - 1; i > 0; --i) {
+                        // qCritical() << __func__ << ":" << __LINE__ << "step[" << i << "]" << stepList.at(i);
+
+                        if (netto_parking_time > 0 && stepList.at(i) <= netto_parking_time) {
+                            int const diff = stepList.at(i-1) - stepList.at(i);
+                            newTicketEndTime = newTicketEndTime.addSecs(diff * 60);
+
+                            // qCritical() << __func__ << ":" << __LINE__ << "new-ticket-end-time" << newTicketEndTime.toString(Qt::ISODate);
+
+                            parkTimeLimitViolated
+                                = wd.getTariffCarryOverSettings()
+                                    .parkingTimeLimitExceeded(start_parking_time, newTicketEndTime, paymentOptionIndex);
+
+                            if (!parkTimeLimitViolated) {
+
+                                qCritical() << __func__ << ":" << __LINE__
+                                            << "PARK-TIME NOT VIOLATED FOR" << newTicketEndTime.toString(Qt::ISODate);
+
+                                int duration = stepList.at(i-1);
+
+                                // qCritical() << __func__ << ":" << __LINE__ << "duration" << duration;
+
+                                std::multimap<int, ATBDuration>::const_iterator it;
+                                for (it = tariff->Duration.cbegin();
+                                     it != tariff->Duration.cend();
+                                     ++it) {
+                                    if (duration == it->second.pun_duration) {
+
+                                        // qCritical() << __func__ << ":" << __LINE__ << "duration" << duration;
+
+                                        ATBPaymentOption &po = tariff->getPaymentOptions(paymentOptionIndex);
+                                        int const pop_id = po.pop_id;
+                                        for (auto[itr, rangeEnd] = tariff->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                            int const durationId = itr->second.pra_payment_unit_id;
+
+                                            // qCritical() << __func__ << ":" << __LINE__ << "durationId" << durationId << it->second.pun_id;
+
+                                            // note: for this to work, Duration and PaymentRate must have
+                                            // exactly the same structure
+                                            if (durationId == it->second.pun_id) {
+                                                int const pra_price = itr->second.pra_price;
+                                                po.pop_max_price = pra_price;
+
+                                                qCritical() << __func__ << ":" << __LINE__ << "new max-price" << po.pop_max_price;
+
+                                                // note: ABOVE_MAX_PARKING_TIME would also be possible
+                                                // but here max-parking-time is dynamic. And for
+                                                // this dynamic value, opverpaid is actually correct
+
+                                                calcState.setDesc(CalcState::OVERPAID);
+                                                calcState.setStatus(CalcState::OVERPAID);
+                                                return calcState;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
                     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);
@@ -1159,7 +1369,9 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         return calcState.set(CalcState::State::INVALID_START_DATE);
     }
 
-    return calcState.set(CalcState::State::SUCCESS);
+    //return calcState.set(CalcState::State::SUCCESS);
+    qCritical() << __func__ << ":" << __LINE__ << "  calcState" << calcState.toString();
+    return calcState;
 }
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff,

library/src/calculator_functions.cpp

@@ -118,13 +118,14 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
     return QDateTime();
 }
 /// <inheritdoc/>
-std::string Calculator::GetDurationFromCost(Configuration* cfg,
+std::pair<std::string, QDateTime>
-                                            uint8_t payment_option,
+Calculator::GetDurationFromCost(Configuration* cfg,
-                                            char const *startDatetimePassed, // given in local time
+                                uint8_t payment_option,
-                                            double cost,
+                                char const *startDatetimePassed, // given in local time
-                                            PermitType /*permitType*/,
+                                double cost,
-                                            bool nextDay,
+                                PermitType /*permitType*/,
-                                            bool prepaid)
+                                bool nextDay,
+                                bool prepaid)
 {
     Q_UNUSED(payment_option);
     Q_UNUSED(nextDay);
@@ -134,7 +135,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     inputDate.setTime(QTime(inputDate.time().hour(), inputDate.time().minute(), 0));
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
-    int paymentOptionIndex = getPaymentOptionIndex(*cfg);
+    bool overPaid = false;
+    bool successMaxPrice = false; // max-price and cost match
+
+    int paymentOptionIndex = getPaymentOptionIndex(*cfg, inputDate);
     if (paymentOptionIndex == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(QDateTime::fromString(startDatetimePassed, Qt::ISODate));
     }
@@ -162,7 +166,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
             // 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 CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
+            return std::make_pair(CalcState::BELOW_MIN_PARKING_PRICE.toStdString(), QDateTime());
         }
 
         if (prepaid == false) {
@@ -225,9 +229,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                             qCritical() << DBG_HEADER << "           minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
 
                             if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
-                                return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
+                                return std::make_pair(CalcState::BELOW_MIN_PARKING_TIME.toStdString(), d); // minimal parking time is set by GetTimeSteps()
                             }
-                            return d.toString(Qt::ISODate).toStdString();
+                            return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
                         }
                     }
 
@@ -240,7 +244,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                         qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
                         qCritical() << DBG_HEADER << "      duration for price:" << durationStr;
 
-                        return durationStr.toStdString();
+                        return std::make_pair(durationStr.toStdString(), d);
                     }
                 }
             }
@@ -254,14 +258,14 @@ std::string Calculator::GetDurationFromCost(Configuration* 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);
                     }
                 }
 
@@ -270,18 +274,25 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                 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 << "SUCCESS MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
+                    successMaxPrice = true;
+                }
+
                 if (cost > pop_max_price) {
                     qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
                     if (pop_allow_overpay == false) {
-                        return CalcState::OVERPAID.toStdString();
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), QDateTime());
                     }
                     cost = pop_max_price;
+                    overPaid = true;
+                    qCritical() << DBG_HEADER << "OVERPAID, MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
                     // 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;
@@ -366,7 +377,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());
                 }
 
                 //qCritical() << __func__ << __LINE__;
@@ -391,7 +402,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
@@ -440,7 +451,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                 QDateTime d(QDateTime::fromString(s, Qt::ISODate));
                                 d = d.addSecs(duration_previous * 60);
                                 //qCritical() << DBG_HEADER << "XXXXXXXXXXXXXXXXXXXXX" << d;
-                                return d.toString(Qt::ISODate).toStdString();
+                                if (overPaid) {
+                                    return std::make_pair(CalcState::OVERPAID.toStdString(), d);
+                                }
+                                if (successMaxPrice) {
+                                    return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), d);
+                                }
+                                return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
                             }
                         } else {
                             durationInSecs = cfg->Duration.find(durationId)->second.pun_duration * 60;
@@ -516,6 +533,16 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
                                                 //qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);
 
+                                                int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
+                                                if (pop_carry_over) {
+                                                    int weekDay = inputDate.date().dayOfWeek();
+                                                    int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+                                                    if (pop_carry_over_option_id != -1) {
+                                                        int const carryOverDuration = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+                                                        inputDate = inputDate.addSecs(carryOverDuration * 60);
+                                                    }
+                                                }
+
                                                 inputDate = inputDate.addSecs(durationInSecs);
 #if DEBUG_GET_DURATION_FROM_COST==1
                                                 qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
@@ -551,7 +578,13 @@ 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);
+                            }
+                            if (successMaxPrice) {
+                                return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), inputDate);
+                            }
+                            return std::make_pair(s.toStdString(), inputDate);
                         } // if ((double)price == cost) {
                         else {
                             //qCritical() << DBG_HEADER;
@@ -561,7 +594,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     }
                 }
 
-                return "";
+                return std::make_pair("", QDateTime());
             }
         }
     } else
@@ -578,7 +611,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) {
@@ -617,7 +650,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());
                 }
             }
 
@@ -635,7 +668,13 @@ 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);
+                    }
+                    if (successMaxPrice) {
+                        return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                    }
+                    return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                 } else {
                     QDateTime const dt = start;
                     start = start.addDays(1);
@@ -682,7 +721,13 @@ 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);
+                    }
+                    if (successMaxPrice) {
+                        return std::make_pair(CalcState::SUCCESS_MAXPRICE.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);
@@ -777,7 +822,13 @@ 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);
+                        }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                     }
                 }
 
@@ -818,7 +869,13 @@ 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);
+                                }
+                                if (successMaxPrice) {
+                                    return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                                }
+                                return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                             }
 
                             // price has been updated; use next time range
@@ -849,7 +906,13 @@ 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);
+                        }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                     }
 
                     if (moveToNextTimeRange) {
@@ -965,8 +1028,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                     << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                     << "price" << price;
 #endif
-
+                        if (overPaid) {
-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                     }
                 }
 
@@ -979,7 +1047,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()) {
         }
 
@@ -988,7 +1059,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);
@@ -996,7 +1067,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_
 
@@ -1426,7 +1497,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
     Q_UNUSED(payment_option);
     Q_UNUSED(nextDay);
 
-    int paymentOptionIndex = getPaymentOptionIndex(*cfg);
+    int paymentOptionIndex = getPaymentOptionIndex(*cfg, start_datetime);
     if (paymentOptionIndex == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
     }

library/src/configuration.cpp

@@ -112,7 +112,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                     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 (member == "prev_day_sunday?") {
                                                 if (l->value.IsArray()) {
                                                     auto limits = l->value.GetArray();
                                                     if (limits.Size() >= 2) {
@@ -120,23 +120,26 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                         parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
                                                     }
                                                     parkTimeLimitChecker = [&cfg, weekDay, weekDayName](ATBTariffCarryOverSettings const& cs,
-                                                                                                       QDateTime const &endTime,
+                                                                                                        QDateTime const &startTime,
-                                                                                                       int paymentOptionIndex) {
+                                                                                                        QDateTime const &endTime,
-                                                        if (endTime.date().dayOfWeek() == (int)weekDay) {
+                                                                                                        int paymentOptionIndex) {
-                                                            if (endTime.time() > cs.m_parking_time_limit) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
-                                                                qCritical() << __func__ << ":" << __LINE__
+                                                            if (endTime.date().dayOfWeek() == (int)weekDay) {
-                                                                            << QString("ERROR time limit for end-time violated: [%1, %2 end-time=%3], but time-limit=%4")
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
-                                                                                    .arg(weekDayName)
+                                                                    qCritical() << __func__ << ":" << __LINE__
-                                                                                    .arg(endTime.date().toString(Qt::ISODate))
+                                                                                << QString("ERROR time limit for end-time violated: [%1, %2 end-time=%3], but time-limit=%4")
-                                                                                    .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(weekDayName)
-                                                                                    .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                                        .arg(endTime.date().toString(Qt::ISODate))
-                                                                return true;
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
-                                                            }
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
-                                                            if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    return true;
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                }
-                                                            } else {
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
-                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
                                                             }
                                                         }
                                                         return false;
@@ -151,23 +154,26 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                         parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
                                                     }
                                                     parkTimeLimitChecker = [&cfg, weekDayName](ATBTariffCarryOverSettings const& cs,
-                                                                                              QDateTime const &endTime,
+                                                                                               QDateTime const &startTime,
-                                                                                              int paymentOptionIndex) {
+                                                                                               QDateTime const &endTime,
-                                                        if (previousDayHoliday(cfg, endTime)) {
+                                                                                               int paymentOptionIndex) {
-                                                            if (endTime.time() > cs.m_parking_time_limit) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
-                                                                qCritical() << __func__ << ":" << __LINE__
+                                                            if (previousDayHoliday(cfg, endTime)) {
-                                                                            << QString("ERROR time limit for end-time violated: [%1, %2, end-time=%3], but time-limit=%4")
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
-                                                                                    .arg(weekDayName)
+                                                                    qCritical() << __func__ << ":" << __LINE__
-                                                                                    .arg(endTime.date().toString(Qt::ISODate))
+                                                                                << QString("ERROR time limit for end-time violated: [%1, %2, end-time=%3], but time-limit=%4")
-                                                                                    .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(weekDayName)
-                                                                                    .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                                        .arg(endTime.date().toString(Qt::ISODate))
-                                                                return true;
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
-                                                            }
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
-                                                            if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    return true;
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                }
-                                                            } else {
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
-                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
                                                             }
                                                         }
                                                         return false;
@@ -251,21 +257,24 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                     }
 
                                                     parkTimeLimitChecker = [&cfg, weekDay](ATBTariffCarryOverSettings const& cs,
-                                                                                     QDateTime const &endTime,
+                                                                                           QDateTime const &startTime,
-                                                                                     int paymentOptionIndex) {
+                                                                                           QDateTime const &endTime,
-                                                        if (endTime.date().dayOfWeek() == (int)weekDay) {
+                                                                                           int paymentOptionIndex) {
-                                                            if (endTime.time() > cs.m_parking_time_limit) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
-                                                                qCritical() << __func__ << ":" << __LINE__
+                                                            if (endTime.date().dayOfWeek() == (int)weekDay) {
-                                                                            << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
-                                                                                    .arg(endTime.time().toString(Qt::ISODate))
+                                                                    qCritical() << __func__ << ":" << __LINE__
-                                                                                    .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                                << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
-                                                                return true;
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
-                                                            }
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
-                                                            if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    return true;
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                }
-                                                            } else {
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
-                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
                                                             }
                                                         }
                                                         return false;
@@ -280,21 +289,24 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                         }
                                                     }
                                                     parkTimeLimitChecker = [&cfg](ATBTariffCarryOverSettings const& cs,
-                                                                                 QDateTime const &endTime,
+                                                                                  QDateTime const &startTime,
-                                                                                 int paymentOptionIndex) {
+                                                                                  QDateTime const &endTime,
-                                                        if (previousDayHoliday(cfg, endTime)) {
+                                                                                  int paymentOptionIndex) {
-                                                            if (endTime.time() > cs.m_parking_time_limit) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
-                                                                qCritical() << __func__ << ":" << __LINE__
+                                                            if (previousDayHoliday(cfg, endTime)) {
-                                                                            << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
-                                                                                    .arg(endTime.time().toString(Qt::ISODate))
+                                                                    qCritical() << __func__ << ":" << __LINE__
-                                                                                    .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                                << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
-                                                                return true;
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
-                                                            }
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
-                                                            if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    return true;
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                }
-                                                            } else {
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
-                                                                cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
-                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
                                                             }
                                                         }
                                                         return false;
@@ -579,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: {
@@ -929,6 +984,10 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             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) {
@@ -941,6 +1000,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             this->currentPaymentOptions.last().pop_min_time = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_max_price") == 0) {
                             this->currentPaymentOptions.last().pop_max_price = k->value.GetDouble();
+                            this->currentPaymentOptions.last().pop_max_price_save = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_max_time") == 0) {
                             this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
@@ -1051,6 +1111,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();
@@ -1418,7 +1479,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;
     }
 
@@ -1521,11 +1581,12 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
     return 0;
 }
 
-int getPaymentOptionIndex(Configuration const &cfg) {
+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;
 
@@ -1533,51 +1594,54 @@ int getPaymentOptionIndex(Configuration const &cfg) {
             return opt;
         }
 
-        QDateTime const dt = QDateTime::currentDateTime();
+        // QDateTime const dt = QDateTime::currentDateTime();
         int const dayOfWeek = dt.date().dayOfWeek();
 
-        switch (dayOfWeek) {
+        // qCritical() << __func__ << ":" << __LINE__ << "dayOfWeek" << 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) {
-                return opt;
-            }
-        } break;
-        }
 
         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;
+            }
         }
     }
 
@@ -1841,6 +1905,7 @@ Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
 
 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) {

main/main.cpp

@@ -1433,10 +1433,6 @@ int main() {
 
         if (isParsed) {
 
-            qCritical() << "Parsed";
-
-            exit(0);
-
             // test library functions
 
             if (zone == 1) {
@@ -1586,7 +1582,8 @@ int main() {
                         fail = false;
                     break;
                     case 1:
-                        start = QDateTime(QDate(2024, 10, 3), QTime(17, 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:
@@ -1631,7 +1628,7 @@ int main() {
                                         << "START" << start.toString(Qt::ISODate)
                                         << "<duration" << *step;
 
-#if 0
+#if 1
                             if ((cs = compute_price_for_parking_ticket(&cfg, s, *step, end, &price,
                                                                        PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
@@ -1646,7 +1643,7 @@ int main() {
                                 }
                             }
 #else
-                            cost = 210;
+                            cost = 200;
                             qCritical() << "START" << start.toString(Qt::ISODate) << "cost" << cost;
 
                             cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,

main/main.pro

@@ -30,7 +30,15 @@ SOURCES += main.cpp
 # HEADERS +=
 
 OTHER_FILES += \
-    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.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 \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff04.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff06.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff07.json