Implement compute_procuct_price()

std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;

library/include/mobilisis/calculate_price.h

@@ -18,6 +18,8 @@
 #define CALCULATE_LIBRARY_API
 #endif
 
+#include "tariff_permit_type.h"
+
 class Configuration;
 
 typedef Configuration parking_tariff_t;
@@ -39,17 +41,6 @@ struct CALCULATE_LIBRARY_API price_t {
     }
 };
 
-enum class PERMIT_TYPE : quint8 {
-    SHORT_TERM_PARKING,
-    DAY_TICKET,
-    SZEGED_START,
-    SZEGED_STOP,
-    DAY_TICKET_ADULT,
-    DAY_TICKET_TEEN,
-    DAY_TICKET_CHILD,
-    INVALID
-};
-
 struct CALCULATE_LIBRARY_API CalcState {
     enum class State : uint8_t {
         SUCCESS,
@@ -161,7 +152,7 @@ QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
 int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
-int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
+int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
                                             parking_tariff_t *tariff,
@@ -174,7 +165,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             QDateTime &start_parking_time,
                                             int netto_parking_time,
                                             QDateTime &end_parking_time,    // return value
-                                            struct price_t *price);         // return value
+                                            struct price_t *price,          // return value
+                                            bool prepaid = true);
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
                                             parking_tariff_t *tariff,

library/include/mobilisis/configuration.h

@@ -24,6 +24,7 @@
 #include "tariff_daily_ticket.h"
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
+#include "tariff_product.h"
 
 #include <QVector>
 #include <optional>
@@ -53,6 +54,7 @@ public:
     multimap<int, ATBTimeStepConfig> TimeStepConfig;
     multimap<int, ATBTimeBase> TimeBase;
     multimap<int, ATBCustomer> Customer;
+    multimap<int, ATBTariffProduct> TariffProduct;
 
 	/// <summary>
 	/// Parse JSON string
@@ -69,6 +71,9 @@ public:
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 

library/include/mobilisis/member_type.h

@@ -18,7 +18,8 @@ enum MemberType
     CustomerType = 0x0B,
     TimeBaseType = 0x0C,
     TimeRangeType = 0x0D,
-    TimeStepConfigType = 0x0E
+    TimeStepConfigType = 0x0E,
+    ProductType = 0x0F
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/tariff_permit_type.h

@@ -0,0 +1,101 @@
+#ifndef TARIFF_PERMIT_TYPE_H_INCLUDED
+#define TARIFF_PERMIT_TYPE_H_INCLUDED
+
+#include <QString>
+
+enum class PERMIT_TYPE : quint8 {
+    SHORT_TERM_PARKING,
+    DAY_TICKET,
+    SZEGED_START,
+    SZEGED_STOP,
+    DAY_TICKET_ADULT,
+    DAY_TICKET_TEEN,
+    DAY_TICKET_CHILD,
+    INVALID
+};
+
+struct PermitType {
+    PERMIT_TYPE m_permitType;
+
+    PermitType() { m_permitType = PERMIT_TYPE::INVALID; }
+    PermitType(int permitType) {
+        switch(permitType) {
+        case 0:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING;
+            break;
+        case 1:
+            m_permitType = PERMIT_TYPE::DAY_TICKET;
+            break;
+        case 2:
+            m_permitType = PERMIT_TYPE::SZEGED_START;
+            break;
+        case 3:
+            m_permitType = PERMIT_TYPE::SZEGED_STOP;
+            break;
+        case 4:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_ADULT;
+            break;
+        case 5:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_TEEN;
+            break;
+        case 6:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
+            break;
+        default:
+            m_permitType = PERMIT_TYPE::INVALID;
+        }
+    }
+    PermitType(PERMIT_TYPE permitType) : m_permitType(permitType) {}
+
+    void set(PERMIT_TYPE p) { m_permitType = p; }
+    PERMIT_TYPE get() const { return m_permitType; }
+
+    operator PERMIT_TYPE() const { return m_permitType; }
+
+    operator int() const {
+        switch(m_permitType) {
+        case PERMIT_TYPE::SHORT_TERM_PARKING:
+            return 0;
+        case PERMIT_TYPE::DAY_TICKET:
+            return 1;
+        case PERMIT_TYPE::SZEGED_START:
+            return 2;
+        case PERMIT_TYPE::SZEGED_STOP:
+            return 3;
+        case PERMIT_TYPE::DAY_TICKET_ADULT:
+            return 4;
+        case PERMIT_TYPE::DAY_TICKET_CHILD:
+            return 5;
+        case PERMIT_TYPE::DAY_TICKET_TEEN:
+            return 6;
+        default:
+            break;
+        }
+        return 7;
+
+    }
+
+    operator QString() const {
+        switch(m_permitType) {
+        case PERMIT_TYPE::DAY_TICKET:
+            return QString("DAY_TICKET");
+        case PERMIT_TYPE::DAY_TICKET_ADULT:
+            return QString("DAY_TICKET_ADULT");
+        case PERMIT_TYPE::DAY_TICKET_CHILD:
+            return QString("DAY_TICKET_CHILD");
+        case PERMIT_TYPE::DAY_TICKET_TEEN:
+            return QString("DAY_TICKET_TEEN");
+        case PERMIT_TYPE::SHORT_TERM_PARKING:
+            return QString("SHORT_TERM_PARKING");
+        case PERMIT_TYPE::SZEGED_START:
+            return QString("SZEGED_START");
+        case PERMIT_TYPE::SZEGED_STOP:
+            return QString("SZEGED_STOP");
+        default:
+            break;
+        }
+        return QString("INVALID");
+    }
+};
+
+#endif // TARIFF_PERMIT_TYPE_H_INCLUDED

library/include/mobilisis/tariff_product.h

@@ -0,0 +1,64 @@
+#ifndef TARIFF_PRODUCT_H_INCLUDED
+#define TARIFF_PRODUCT_H_INCLUDED
+
+#include <QString>
+#include <QDateTime>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+#include "tariff_permit_type.h"
+
+struct ATBTariffProduct {
+    PermitType m_tariff_product_id;
+    uint32_t m_tariff_product_price;
+    QString m_tariff_product_name;
+    QTime m_tariff_product_start;
+    QTime m_tariff_product_end;
+    int m_tariff_product_from_in_minutes_from_start;
+    int m_tariff_product_to_in_minutes_from_start;
+
+    explicit ATBTariffProduct() = default;
+
+    QTime const &getTimeStart() const { return m_tariff_product_start; }
+    QTime const &getTimeEnd() const { return m_tariff_product_end; }
+
+    bool computeQTimeStart(QTime const &t) {
+        if (m_tariff_product_from_in_minutes_from_start != -1) {
+            m_tariff_product_start = t.addSecs(m_tariff_product_from_in_minutes_from_start * 60);
+            return m_tariff_product_start.isValid();
+        }
+        return false;
+    }
+
+    bool computeQTimeEnd(QTime const &t) {
+        if (m_tariff_product_to_in_minutes_from_start != -1) {
+            m_tariff_product_end = t.addSecs(m_tariff_product_from_in_minutes_from_start * 60);
+            return m_tariff_product_end.isValid();
+        }
+        return false;
+    }
+
+    bool computeQTimes(QTime const &t) {
+        if (!t.isNull() && t.isValid()) {
+            return computeQTimeStart(t) && computeQTimeEnd(t);
+        }
+        return false;
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffProduct const &product) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                        m_tariff_product_id: " << QString(product.m_tariff_product_id) << "\n"
+            << "                      m_tariff_product_name: " << product.m_tariff_product_name << "\n"
+            << "                     m_tariff_product_price: " << product.m_tariff_product_price << "\n"
+            << "                     m_tariff_product_start: " << product.m_tariff_product_start << "\n"
+            << "                       m_tariff_product_end: " << product.m_tariff_product_end << "\n"
+            << "m_tariff_product_from_in_minutes_from_start: " << product.m_tariff_product_from_in_minutes_from_start << "\n"
+            << "  m_tariff_product_to_in_minutes_from_start: " << product.m_tariff_product_to_in_minutes_from_start << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_PRODUCT_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -90,6 +90,7 @@ namespace Utilities {
     uint32_t getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId);
     uint32_t getMaximalParkingPrice(Configuration const *cfg, PaymentMethod methodId);
     uint32_t getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId);
+    uint32_t getTimeRangeStep(Configuration const *cfg, int step, PaymentMethod methodId);
     BusinessHours getBusinessHours(Configuration const *cfg, PaymentMethod methodId);
     uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id);
     double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);

library/library.pro

@@ -77,7 +77,9 @@ HEADERS += \
     include/mobilisis/tariff_daily_ticket.h \
     include/mobilisis/tariff_customer.h \
     include/mobilisis/tariff_timebase.h \
-    include/mobilisis/tariff_timestep_config.h
+    include/mobilisis/tariff_timestep_config.h \
+    include/mobilisis/tariff_product.h \
+    include/mobilisis/tariff_permit_type.h
 
 OTHER_FILES += src/main.cpp \
     ../tariffs/tariff_korneuburg.json \

library/src/calculate_price.cpp

@@ -76,19 +76,50 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TY
     return minPrice;
 }
 
-int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
-    int maxPrice = -1;
+int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT_TYPE permitType) {
 
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
-        int const key = cfg->getPaymentOptions().pop_id;
-        int const maxTime = cfg->getPaymentOptions().pop_max_time; // maxTime is given in minutes
-        std::optional<QVector<ATBPaymentRate>> const &pv = cfg->getPaymentRateForKey(key);
-        if (pv) {
-            QVector<ATBPaymentRate> const &paymentRate = pv.value();
-            if (paymentRate.size() > 0) {
-                int const price = paymentRate.at(0).pra_price; // price is given per hour
-                maxPrice = qRound((maxTime * price) / 60.0f);
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET_TEEN:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            QVector<ATBTariffProduct> product = products.value();
+            if (product.size() > 0) {
+                ATBTariffProduct const &p = product[0];
+                return p.m_tariff_product_price;
+            }
+        }
+    } break;
+    default:
+      break;
+    }
+
+    return 0;
+}
+
+int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
+    int maxPrice = -1;
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        if (paymentMethodId == PaymentMethod::Progressive) {
+            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+        } else { // PaymentMethod::Linear -> e.g. szeged
+            int const key = cfg->getPaymentOptions().pop_id;
+            int const maxTime = cfg->getPaymentOptions().pop_max_time; // maxTime is given in minutes
+            std::optional<QVector<ATBPaymentRate>> const &pv = cfg->getPaymentRateForKey(key);
+            if (pv) {
+                QVector<ATBPaymentRate> const &paymentRate = pv.value();
+                if (paymentRate.size() > 0) {
+                    int const price = paymentRate.at(0).pra_price; // price is given per hour
+                    maxPrice = qRound((maxTime * price) / 60.0f);
+                }
             }
         }
     } break;
@@ -217,7 +248,9 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
 
     // use tariff with structure as for instance Schnau, Koenigsee:
     // without given YearPeriod, SpecialDays and SpecialDaysWorktime
-    if (paymentMethodId == PaymentMethod::Steps)
+    if ((paymentMethodId == PaymentMethod::Steps) ||
+        // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
+        (paymentMethodId == PaymentMethod::Progressive))
     {
         const QList<int> stepList = Calculator::GetInstance().GetTimeSteps(tariff);
         qCritical() << "   compute_next_timestep()     timeSteps:" << stepList;
@@ -345,7 +378,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         QDateTime &start_parking_time,
         int netto_parking_time,
         QDateTime &end_parking_time,
-        struct price_t *price)
+        struct price_t *price,
+        bool prepaid)
 {
     CalcState calcState;
     double minMin = tariff->getPaymentOptions().pop_min_time;
@@ -384,7 +418,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                         start_parking_time,         // starting time
                         end_parking_time,           // return value: end time
                         netto_parking_time,         // minutes, netto
-                        false, true);
+                        false, prepaid);
         double minCost = tariff->getPaymentOptions().pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));

library/src/calculator_functions.cpp

@@ -157,6 +157,17 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
         static const bool carryOverNotSet = Utilities::isCarryOverNotSet(cfg, paymentMethodId);
         static const uint minParkingPrice = Utilities::getMinimalParkingPrice(cfg, paymentMethodId);
+        static const uint maxParkingPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+
+        if (cost < minParkingPrice) {
+            qCritical() << QString("ERROR: COST < MIN_PARKING_PRICE (%1 < %2)").arg(cost).arg(minParkingPrice);
+            return QDateTime().toString(Qt::ISODate).toStdString();
+        }
+
+        if (cost > maxParkingPrice) {
+            qCritical() << QString("WARN: COST > MAX_PARKING_PRICE (%1 > %2)").arg(cost).arg(maxParkingPrice);
+            cost = maxParkingPrice;
+        }
 
         Q_ASSERT_X(carryOverNotSet, __func__, "CARRYOVER SET (FOR KIRCHDORF)");
         Q_ASSERT_X(prepaid, __func__, "PREPAID NOT SET (FOR KIRCHDORF)");
@@ -220,6 +231,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
         if (carryOverNotSet) {
             int range = 0;
             int minsToCarryOver = 0; // from one work-time to the other on the same day
+            int minsUsed = 0;
             QDateTime lastCurrent = QDateTime();
 
             auto timeRangeIt = cfg->TimeRange.cbegin();
@@ -235,7 +247,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
                     Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
-
                     if (current.time() >= to) {
                         continue; // try to use next available work-time
                     } else
@@ -261,24 +272,29 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                         int duration = timeRange.time_range_to_in_minutes_from_start -
                                        timeRange.time_range_from_in_minutes_from_start;
 
-                        if (current.addSecs(duration * 60).time() <= to) {
-                            for(const auto &x: cfg->PaymentRate) {
-                                ATBPaymentRate const rate = x.second;
-                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    if (minsToCarryOver > 0) {
-                                        durationMinutes -= minsToCarryOver;
-                                        durationMinutesNetto += minsToCarryOver;
-                                        durationMinutesBrutto += minsToCarryOver;
-                                        current = current.addSecs(minsToCarryOver*60);
-                                        minsToCarryOver = 0;
-                                    } else {
-                                        if (price >= cost) {
-                                            end_datetime = current;
-                                            return end_datetime.toString(Qt::ISODate).toStdString();
-                                        }
+                        if (minsUsed > 0) {
+                            duration -= minsUsed;
+                            minsUsed = 0;
+                        }
 
+                        if (current.addSecs(duration * 60).time() <= to) {
+                            if (minsToCarryOver > 0) {  // the price for this time range
+                                                        // has been is paid already
+                                durationMinutes -= duration;
+                                durationMinutesNetto += duration;
+                                durationMinutesBrutto += duration;
+                                current = current.addSecs(duration*60);
+                                minsToCarryOver = 0;
+                            } else {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
                                         price += (uint)rate.pra_price;
 
+                                        if (price >= maxParkingPrice) {
+                                            price = maxParkingPrice;
+                                        }
+
                                         durationMinutes -= duration;
                                         durationMinutesNetto += duration;
                                         durationMinutesBrutto += duration;
@@ -289,8 +305,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             end_datetime = current;
                                             return end_datetime.toString(Qt::ISODate).toStdString();
                                         }
+
+                                        break;
                                     }
-                                    break;
                                 }
                             }
 
@@ -305,21 +322,28 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
                             lastCurrent = current;
                             current.setTime(to);
-                            int const minsLeft = lastCurrent.secsTo(current) / 60;
+                            minsUsed = lastCurrent.secsTo(current) / 60;
 
                             // mod duration: possibly discard some minutes in
                             // the next time-range
-                            minsToCarryOver = (durationMinutes - minsLeft) % duration;
+                            if (durationMinutes >= minsUsed) {
+                                minsToCarryOver = durationMinutes - minsUsed;
+                            }
 
-                            durationMinutes -= minsLeft;
-                            durationMinutesNetto += minsLeft;
-                            durationMinutesBrutto += minsLeft;
+                            durationMinutes -= minsUsed;
+                            durationMinutesNetto += minsUsed;
+                            durationMinutesBrutto += minsUsed;
 
-                            if (minsLeft > 0) {
+                            if (minsUsed > 0) {
                                 for(const auto &x: cfg->PaymentRate) {
                                     ATBPaymentRate const rate = x.second;
                                     if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
                                         price += (uint)rate.pra_price;
+
+                                        if (price >= maxParkingPrice) {
+                                            price = maxParkingPrice;
+                                        }
+
                                         if (price >= cost) {
                                             end_datetime = current;
                                             // return end_datetime.toString(Qt::ISODate).toStdString();
@@ -328,7 +352,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                     }
                                 }
                             }
-
                             break;
                         }
                     }
@@ -473,9 +496,11 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                         end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
                         return cost;
                     }
+                } else {
+                    // it might be that in such a case even prepaid ("vorkauf")
+                    // is not allowed at any moment
                 }
-
-                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
                 end_datetime = QDateTime();
                 return 0;
             }
@@ -527,6 +552,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
 
             if (current.time() >= to) {
                 if (carryOverNotSet) {
+                    end_datetime = start;
                     return 0;
                 } else {
                     QDateTime const dt = start;
@@ -547,6 +573,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
         if (carryOverNotSet) {
             int range = 0;
             int minsToCarryOver = 0; // from one work-time to the other on the same day
+            int minsUsed = 0;
             QDateTime lastCurrent = QDateTime();
 
             auto timeRangeIt = cfg->TimeRange.cbegin();
@@ -562,7 +589,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
 
                     Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
-
                     if (current.time() >= to) {
                         continue; // try to use next available work-time
                     } else
@@ -588,18 +614,23 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                         int duration = timeRange.time_range_to_in_minutes_from_start -
                                        timeRange.time_range_from_in_minutes_from_start;
 
-                        if (current.addSecs(duration * 60).time() <= to) {
+                        if (minsUsed > 0) {
+                            duration -= minsUsed;
+                            minsUsed = 0;
+                        }
 
-                            for(const auto &x: cfg->PaymentRate) {
-                                ATBPaymentRate const rate = x.second;
-                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    if (minsToCarryOver > 0) {
-                                        durationMinutes -= minsToCarryOver;
-                                        durationMinutesNetto += minsToCarryOver;
-                                        durationMinutesBrutto += minsToCarryOver;
-                                        current = current.addSecs(minsToCarryOver*60);
-                                        minsToCarryOver = 0;
-                                    } else {
+                        if (current.addSecs(duration * 60).time() <= to) {
+                            if (minsToCarryOver > 0) {  // the price for this time range
+                                                        // has been is paid already
+                                durationMinutes -= duration;
+                                durationMinutesNetto += duration;
+                                durationMinutesBrutto += duration;
+                                current = current.addSecs(duration*60);
+                                minsToCarryOver = 0;
+                            } else {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
                                         price += (uint)rate.pra_price;
 
                                         durationMinutes -= duration;
@@ -607,8 +638,8 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                         durationMinutesBrutto += duration;
 
                                         current = current.addSecs(duration * 60);
+                                        break;
                                     }
-                                    break;
                                 }
                             }
 
@@ -623,17 +654,19 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
 
                             lastCurrent = current;
                             current.setTime(to);
-                            int const minsLeft = lastCurrent.secsTo(current) / 60;
+                            minsUsed = lastCurrent.secsTo(current) / 60;
 
                             // mod duration: possibly discard some minutes in
                             // the next time-range
-                            minsToCarryOver = (durationMinutes - minsLeft) % duration;
+                            if (durationMinutes >= minsUsed) {
+                                minsToCarryOver = durationMinutes - minsUsed;
+                            }
 
-                            durationMinutes -= minsLeft;
-                            durationMinutesNetto += minsLeft;
-                            durationMinutesBrutto += minsLeft;
+                            durationMinutes -= minsUsed;
+                            durationMinutesNetto += minsUsed;
+                            durationMinutesBrutto += minsUsed;
 
-                            if (minsLeft > 0) {
+                            if (minsUsed > 0) {
                                 for(const auto &x: cfg->PaymentRate) {
                                     ATBPaymentRate const rate = x.second;
                                     if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
@@ -642,7 +675,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                     }
                                 }
                             }
-
                             break;
                         }
                     }
@@ -1145,6 +1177,8 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
 
+    static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
     qCritical() << __func__ << ":" << __LINE__ << "       start parking time:" << start.toString(Qt::ISODate);
     qCritical() << __func__ << ":" << __LINE__ << "        payment option id:" << pop_id;
     qCritical() << __func__ << ":" << __LINE__ << "payment option carry over:" << pop_carry_over;
@@ -1152,63 +1186,71 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
         //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
 
-        uint16_t timeStepCompensation = 0;
+        if (paymentMethodId == PaymentMethod::Progressive) { // e.g. neuhauser kirchdorf (743)
+            std::size_t const s = cfg->TimeRange.size();
+            for (std::size_t id = 1; id <= s; ++id) {
+                int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
+                m_timeSteps.append(step);
+            }
+        } else {
+            uint16_t timeStepCompensation = 0;
 
-        if (pop_carry_over) {
-            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
-            QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
-            QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
+            if (pop_carry_over) {
+                int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+                QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
+                QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
 
-            if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
-                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                        int const durationId = itr->second.pra_payment_unit_id;
-                        auto search = cfg->Duration.find(durationId);
-                        if (search != cfg->Duration.end()) {
-                            ATBDuration duration = search->second;
-                            if (durationId == 1) {
-                                QDateTime carryOver = start;
-                                carryOver = carryOver.addDays(1);
-                                carryOver.setTime(QTime(0, 0, 0));
+                if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
+                    if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                            int const durationId = itr->second.pra_payment_unit_id;
+                            auto search = cfg->Duration.find(durationId);
+                            if (search != cfg->Duration.end()) {
+                                ATBDuration duration = search->second;
+                                if (durationId == 1) {
+                                    QDateTime carryOver = start;
+                                    carryOver = carryOver.addDays(1);
+                                    carryOver.setTime(QTime(0, 0, 0));
 
-                                int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
-                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
-                                    qCritical()
-                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
-                                            .arg(timeStep).arg(duration.pun_duration_min)
-                                            .arg(timeStep).arg(duration.pun_duration_max);
-                                    break;
+                                    int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
+                                    if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                        qCritical()
+                                            << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                                .arg(timeStep).arg(duration.pun_duration_min)
+                                                .arg(timeStep).arg(duration.pun_duration_max);
+                                        break;
+                                    }
+                                    qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+
+                                    // set dynamic minimal parking time
+                                    cfg->getPaymentOptions().pop_min_time = timeStep;
+
+                                    qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+
+                                    duration.pun_duration = timeStep;
+                                    timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
+                                    m_timeSteps << duration.pun_duration;
+                                } else {
+                                    duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
+                                    m_timeSteps << duration.pun_duration;;
                                 }
-                                qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
 
-                                // set dynamic minimal parking time
-                                cfg->getPaymentOptions().pop_min_time = timeStep;
+                                cfg->Duration.erase(search);
+                                cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
 
-                                qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
-
-                                duration.pun_duration = timeStep;
-                                timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
-                                m_timeSteps << duration.pun_duration;
-                            } else {
-                                duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
-                                m_timeSteps << duration.pun_duration;;
+                            } else { // if (search != cfg->Duration.end()) {
+                               // TODO
                             }
-
-                            cfg->Duration.erase(search);
-                            cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
-
-                        } else { // if (search != cfg->Duration.end()) {
-                           // TODO
                         }
+                    } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                        // TODO
                     }
-                } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                     // TODO
                 }
-            } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
+            } else { // if (pop_carry_over) {
                 // TODO
             }
-        } else { // if (pop_carry_over) {
-            // TODO
         }
     } else {
         qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";
@@ -1381,6 +1423,18 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                 case PERMIT_TYPE::INVALID:
                     break;
             }
+        } else {
+            // for projects which have not defined a daily ticket in their
+            // tariff-files (e.g. szeged)
+            price.netto = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+            qCritical() << "                  start:" << startDatetime.toString(Qt::ISODate);
+            qCritical() << "          workTime from:" << QTime::fromString(QString(wt.pwd_time_from.c_str()), Qt::ISODate);
+            qCritical() << "            workTime to:" << QTime::fromString(QString(wt.pwd_time_to.c_str()), Qt::ISODate);
+            qCritical() << "daily_ticket_card_price:" << price.netto;
+
+            value = value.value_or(price);
         }
     }
 

library/src/configuration.cpp

@@ -2,6 +2,7 @@
 #include "tariff_timebase.h"
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
+#include "tariff_permit_type.h"
 
 #include <QString>
 #include <QDebug>
@@ -24,6 +25,7 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
     if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
     if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType;
     if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType;
+    if (strcmp(member_name, "Product") == 0) return MemberType::ProductType;
     else return MemberType::UnknownType;
 }
 
@@ -93,6 +95,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
         ATBCustomer Customer;
         ATBTimeRange TimeRange;
         ATBTimeStepConfig TimeStepConfig;
+        ATBTariffProduct TariffProduct;
 
         MemberType mb_type = MemberType::UnknownType;
         this->currentPaymentOptions.clear();
@@ -157,6 +160,50 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					{
 					case MemberType::UnknownType:
 						break;
+                    case MemberType::ProductType: {
+                        if (QString(inner_obj_name) == QString("tariff_product_id")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_id = PermitType(x);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_price")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_price = x;
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_name")) {
+                            if (k->value.IsString()) {
+                                std::string const &s = k->value.GetString();
+                                TariffProduct.m_tariff_product_name = QString::fromStdString(s);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_start")) {
+                            if (k->value.IsString()) {
+                                std::string const &s = k->value.GetString();
+                                TariffProduct.m_tariff_product_start = QTime::fromString(QString::fromStdString(s), Qt::ISODate);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_end")) {
+                            if (k->value.IsString()) {
+                                std::string const &s = k->value.GetString();
+                                TariffProduct.m_tariff_product_end = QTime::fromString(QString::fromStdString(s), Qt::ISODate);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_from_in_minutes_from_start")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_from_in_minutes_from_start = x;
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_to_in_minutes_from_start")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_to_in_minutes_from_start = x;
+                            }
+                        }
+                    } break;
                     case MemberType::TimeRangeType:
                         if (QString(inner_obj_name) == QString("time_range_id")) {
                             if (k->value.IsInt()) {
@@ -479,6 +526,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
                     // qCritical() << TimeStepConfig;
                     break;
+                case MemberType::ProductType:
+                    cfg->TariffProduct.insert(pair<int, ATBTariffProduct>(TariffProduct.m_tariff_product_id, TariffProduct));
+                    qCritical() << TariffProduct;
                 default:
 					break;
 				}
@@ -492,6 +542,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 	}
 }
 
+
 ATBPaymentOption const &Configuration::getPaymentOptions() const {
     Q_ASSERT(!this->currentPaymentOptions.isEmpty());
     return this->currentPaymentOptions.at(0);
@@ -510,6 +561,48 @@ QVector<ATBPaymentOption> &Configuration::getAllPaymentOptions() {
     return this->currentPaymentOptions;
 }
 
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForAllKeys() const {
+    QVector<ATBTariffProduct> products;
+    std::optional<QVector<ATBTariffProduct>> value;
+
+    products.clear();
+
+    for (std::multimap<int, ATBTariffProduct>::const_iterator it = this->TariffProduct.cbegin();
+        it != this->TariffProduct.cend(); ++it) {
+        products.append(it->second);
+    }
+
+    if (products.size() > 0) {
+        value = value.value_or(products);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForProductId(PermitType permitType) const {
+    QVector<ATBTariffProduct> products;
+    std::optional<QVector<ATBTariffProduct>> value;
+
+    products.clear();
+
+    for (auto[it, rangeEnd] = this->TariffProduct.equal_range(permitType); it != rangeEnd; ++it) {
+        products.append(it->second);
+    }
+
+    if (products.size() > 0) {
+        value = value.value_or(products);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForProductId(int id) const {
+    return getTariffProductForProductId(PermitType(id));
+}
+
 std::optional<QVector<ATBDailyTicket>>
 Configuration::getDailyTicketsForAllKeys() const {
     QVector<ATBDailyTicket> tickets;

library/src/utilities.cpp

@@ -397,6 +397,14 @@ uint32_t Utilities::getMaximalParkingPrice(Configuration const *cfg, PaymentMeth
     return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_price, 0);
 }
 
+uint32_t Utilities::getTimeRangeStep(Configuration const *cfg, int step, PaymentMethod methodId) {
+    if (methodId == PaymentMethod::Progressive) {
+        return std::max((int)cfg->TimeRange.find(step)->second.time_range_to_in_minutes_from_start, 0);
+    }
+
+    return 0;
+}
+
 uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId) {
 
     int const popId = cfg->PaymentOption.find(methodId)->second.pop_id;

main/main.cpp

@@ -27,6 +27,7 @@ extern "C" char* strptime(const char* s,
 #include <QDebug>
 #include <QDateTime>
 #include <QDir>
+#include <QFileInfo>
 
 #include <fstream>
 #include <sstream>
@@ -37,10 +38,125 @@ extern "C" char* strptime(const char* s,
 #define SCHOENAU_KOENIGSEE                      (0)
 #define NEUHAUSER_KORNEUBURG                    (0)
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
-#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
+#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (1)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
-#define NEUHAUSER_KIRCHDORF                     (1)
+#define NEUHAUSER_KIRCHDORF                     (0)
 
+#if NEUHAUSER_KIRCHDORF==1
+static bool test_neuhauser_kirchdorf(int step, double cost) {
+    switch (step) {
+    case 30:
+        if (cost != 30) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 30;
+            return false;
+        }
+        break;
+    case 35:
+        if (cost != 40) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 40;
+            return false;
+        }
+        break;
+    case 40:
+        if (cost != 50) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 50;
+            return false;
+        }
+        break;
+    case 45:
+        if (cost != 60) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 60;
+            return false;
+        }
+        break;
+    case 50:
+        if (cost != 70) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 70;
+            return false;
+        }
+        break;
+    case 55:
+        if (cost != 80) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 80;
+            return false;
+        }
+        break;
+    case 60:
+        if (cost != 90) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 90;
+            return false;
+        }
+        break;
+    case 65:
+        if (cost != 100) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 100;
+            return false;
+        }
+        break;
+    case 70:
+        if (cost != 110) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 110;
+            return false;
+        }
+        break;
+    case 75:
+        if (cost != 120) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 120;
+            return false;
+        }
+        break;
+    case 80:
+        if (cost != 130) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 130;
+            return false;
+        }
+        break;
+    case 85:
+        if (cost != 140) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 140;
+            return false;
+        }
+        break;
+    case 90:
+        if (cost != 150) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 150;
+            return false;
+        }
+        break;
+    default:
+        break;
+    }
+
+    return true;
+}
+
+#endif
 
 int main() {
 #if SCHOENAU_KOENIGSEE==1
@@ -89,6 +205,160 @@ int main() {
 #endif
 
 #if NEUHAUSER_KIRCHDORF==1
+    if (QDir("/opt/app/tools/atbupdate/customer_743").exists()) {
+        if(QFileInfo::exists("/etc/psa_tariff/tariff01.json")) {
+    // if (true) {
+    //    if(true) {
+            const char *f = "/etc/psa_tariff/tariff01.json";
+            // const char *f = "/opt/ptu5/opt/customer_743/etc/psa_tariff/tariff01.json";
+            std::ifstream input(f);
+
+            std::stringstream sstr;
+            while(input >> sstr.rdbuf());
+            std::string json(sstr.str());
+
+            Configuration cfg;
+            bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+
+            if (!isParsed) {
+                qCritical() << "ERROR: CANNOT PARSE" << f;
+                return -1;
+            }
+            qCritical() << "Successfully parsed" << f;
+
+            int const minParkingTime = get_minimal_parkingtime(&cfg);
+            int const maxParkingTime = get_maximal_parkingtime(&cfg);
+            int const minParkingPrice = get_minimal_parkingprice(&cfg);
+
+            if (minParkingTime != 30) {
+                qCritical() << "ERROR: WRONG MIN_PARKING_TIME" << minParkingTime;
+                return -1;
+            }
+            qCritical() << "min_parking_time " << minParkingTime;
+
+            if (maxParkingTime != 90) {
+                qCritical() << "ERROR: WRONG MAX_PARKING_TIME" << maxParkingTime;
+                return -1;
+            }
+            qCritical() << "max_parking_time " << maxParkingTime;
+
+
+            if (minParkingPrice != 30) {
+                qCritical() << "ERROR: WRONG MIN_PARKING_PRICE" << minParkingPrice;
+                return -1;
+            }
+            qCritical() << "min_parking_price" << minParkingPrice;
+
+            QList<int> const stepsConfigured
+                = QList(std::initializer_list<int>{
+                    30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90});
+
+            QList<int> const steps = Calculator::GetInstance().GetTimeSteps(&cfg);
+
+            if (stepsConfigured != steps) {
+                qCritical() << "ERROR: WRONG TIME-STEP-LIST" << steps;
+                qCritical() << "SHOULD BE" << stepsConfigured;
+                return -1;
+            }
+            qCritical() << "time steps" << steps;
+
+            QDateTime s(QDate(2024, 2, 21), QTime());
+            QDateTime end;
+            struct price_t price;
+
+            QList<int>::const_iterator step;
+            for (step = steps.cbegin(); step != steps.cend(); ++step) {
+                qCritical() << QString("*** NEXT STEP: %1 ***").arg(*step);
+                for (int offset = 7*60; offset < 18*60; ++offset) {
+                    QDateTime start = s.addSecs(offset * 60);
+                    QDateTime const firstStart = start;
+
+                    if (compute_price_for_parking_ticket(&cfg, start, *step, end, &price)) {
+                        double cost = price.netto;
+
+                        //qCritical() << "****" << offset << *step << "****";
+                        //qCritical() << "    firstStart :" << firstStart.toString(Qt::ISODate);
+                        //qCritical() << "    start      :" << start.toString(Qt::ISODate);
+                        //qCritical() << "    end        :" << end.toString(Qt::ISODate);
+
+                        if (offset < 8*60) {    // [7:00 - 8:00[
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 9*60) {    // [8:00 - 9:00[
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 10*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 11*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 12*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 13*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 14*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 15*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 16*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else
+                        if (offset < 17*60) {
+                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                                return -1;
+                            }
+                        } else {
+                            qCritical() << "WARN OFFSET TOO HIGH" << offset;
+                        }
+
+                    } else {
+                        qCritical() << "ERROR COMPUTING PRICE FOR"
+                                    << "start" << start.toString(Qt::ISODate)
+                                    << "step" << *step
+                                    << "end" << end.toString(Qt::ISODate);
+                        return -1;
+                    }
+
+                }
+            }
+        }
+        return 0;
+    }
+
+#if 0
     const char *f = "/opt/ptu5/opt/customer_743/etc/psa_tariff/tariff01.json";
     std::ifstream input(f);
 
@@ -110,18 +380,18 @@ int main() {
         qCritical() << "max_parking_time " << maxParkingTime;
         qCritical() << "min_parking_price" << minParkingPrice;
 
-#if 1
         bool nextDay = false;
         bool prePaid = true;
         // bool carryOver = false;
 
-        QDateTime s(QDate(2023, 11, 30), QTime());
-        // QDateTime s(QDate(2023, 11, 26), QTime());
+        //QDateTime s = QDateTime::currentDateTime();
+        QDateTime s(QDate(2024, 2, 21), QTime());
         QDateTime end;
         for (int duration = 30; duration <= 90; duration += 5) {
         // for (int duration = 30; duration <= maxParkingTime; duration += 5) {
             qCritical() << "";
             for (int offset = 420; offset <= 1080; ++offset) {
+            //for (int offset = 0; offset <= 0; ++offset) {
             //for (int offset = 420; offset <= 1080; ++offset) {
                 //if (offset > 720 && offset < 840) {
                 //    continue;
@@ -130,7 +400,12 @@ int main() {
                 QDateTime const firstStart = start;
                 // qCritical() << "start" << start.toString(Qt::ISODate);
 
-                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 1, start, end, duration, nextDay, prePaid);
+                // double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 1, start, end, duration, nextDay, prePaid);
+
+                struct price_t price;
+                compute_price_for_parking_ticket(&cfg, start, duration, end, &price);
+
+                double cost = price.netto;
 
 //#if COST_FROM_DURATION==0
                 double cost_soll = 30 + ((duration-30)/5 * 10);
@@ -140,54 +415,52 @@ int main() {
                     duration_ist = duration_ist - 120;
                 }
 
-
                 qCritical() << "****" << offset << duration << "****";
                 qCritical() << "    firstStart :" << firstStart.toString(Qt::ISODate);
                 qCritical() << "    start      :" << start.toString(Qt::ISODate);
                 qCritical() << "    end        :" << end.toString(Qt::ISODate);
-                qCritical() << "duration (soll):" << duration;
-                qCritical() << "duration (ist) :" << duration_ist;
-                qCritical() << "    cost (soll):" << cost_soll;
-                qCritical() << "    cost (ist) :" << cost;
+                //qCritical() << "duration (soll):" << duration;
+                //qCritical() << "duration (ist) :" << duration_ist;
+                //qCritical() << "    cost (soll):" << cost_soll;
+                //qCritical() << "    cost (ist) :" << cost;
 
-                if (cost_soll != cost) {
+           //     if (cost_soll != cost) {
                     //qCritical() << "ERROR" << __func__ << ":" << __LINE__
                     //            << "cost_soll" << cost_soll << "cost_ist" << cost;
                     //break;
-                }
-                if (duration != duration_ist) {
+           //     }
+           //     if (duration != duration_ist) {
                     //qCritical() << "ERROR" << __func__ << ":" << __LINE__
                     //            << "duration_soll" << duration << "duration_ist" << duration_ist;
                     //break;
-                }
+           //     }
 
 //#else
-                start = s.addSecs(offset * 60);
-                std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 1,
-                                                                                     start.toString(Qt::ISODate).toStdString().c_str(),
-                                                                                     cost, false, true);
+                //start = s.addSecs(offset * 60);
+                //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 1,
+                //                                                                     start.toString(Qt::ISODate).toStdString().c_str(),
+                //                                                                     cost, false, true);
 
 
-                if (end.toString(Qt::ISODate) != QString(duration.c_str())) {
+                //if (end.toString(Qt::ISODate) != QString(duration.c_str())) {
                     //qCritical() << "ERROR" << end.toString(Qt::ISODate)
                     //            << QString(duration.c_str());
                     //break;
 
-                }
+                //}
 
-                qCritical() << "start" << start.toString(Qt::ISODate)
-                            << "cost" << cost
-                            << "until" << duration.c_str()
-                            << "end" << end.toString(Qt::ISODate)
-                            << ":" << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60
-                            << (end.toString(Qt::ISODate) == QString(duration.c_str()));
+                //qCritical() << "start" << start.toString(Qt::ISODate)
+                //            << "cost" << cost
+                //            << "until" << duration.c_str()
+                //            << "end" << end.toString(Qt::ISODate)
+                //            << ":" << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60
+                //            << (end.toString(Qt::ISODate) == QString(duration.c_str()));
 
 //#endif // COST_FROM_DURATION
 
             }
         }
 #endif // 0
-    }
 #endif
 
 #if NEUHAUSER_BILEXA_GALTUER==1
@@ -236,9 +509,23 @@ int main() {
     cout << endl;
 
     if (isParsed) {
+
+        int v = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET_ADULT);
+        qCritical() << "price adult" << v;
+
+        int w = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET_TEEN);
+        qCritical() << "price teen" << w;
+
+        return 0;
+
+
+
         QDateTime s(QDate(2023, 11, 30), QTime());
         QDateTime end;
         struct price_t price;
+#define ADULT 0
+#define TEEN 1
+#if ADULT==1
         for (int offset = 480; offset < 1080; ++offset) {
             QDateTime start = s.addSecs(offset * 60);
 
@@ -249,7 +536,9 @@ int main() {
             qCritical() << "start=" << start.toString(Qt::ISODate)
                         << "end" << end.toString(Qt::ISODate) << "price" << price.netto;
         }
+#endif
 
+#if TEEN==1
         for (int offset = 480; offset < 1080; ++offset) {
             QDateTime start = s.addSecs(offset * 60);
             CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
@@ -257,6 +546,7 @@ int main() {
             qCritical() << "start=" << start.toString(Qt::ISODate)
                         << "end" << end.toString(Qt::ISODate) << "price" << price.netto;
         }
+#endif
     }
 
 #endif
@@ -282,16 +572,23 @@ int main() {
         QDateTime end;
         int marken[] = { 3*60, 5*60, 10*60};
         for (int duration = 0; duration < 3; ++duration) {
-            for (int offset = 360; offset <= 1080; ++offset) {
+            for (int offset = 360; offset <= 360; ++offset) {
+            // for (int offset = 360; offset < 1080; ++offset) {
                 QDateTime start = s.addSecs(offset * 60);
                 //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
-                //qCritical() << "";
-                qCritical() << "start" << start.toString(Qt::ISODate)
-                            << "end" << end.toString(Qt::ISODate)
-                            << "duration" << marken[duration]
-                            << "cost" << cost;
+                // note: prepaid == false (!)
+                // double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
+
+                struct price_t price;
+                if (compute_price_for_parking_ticket(&cfg, start, marken[duration], end, &price, prePaid)) {
+                    double cost = price.netto;
+
+                    qCritical() << "start" << start.toString(Qt::ISODate)
+                                << "end" << end.toString(Qt::ISODate)
+                                << "duration" << marken[duration]
+                                << "cost" << cost;
+                }
 
                 //std::string d = Calculator::GetInstance().GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
                 //qCritical() << "start" << start.toString(Qt::ISODate)
@@ -357,10 +654,11 @@ int main() {
     int pop_max_time;
     int pop_min_price;
     int pop_max_price;
+    int pop_daily_card_price;
 
-    for (int t=1; t < 2; ++t) {
+    for (int zone=2; zone < 3; ++zone) {
     //for (int t=6; t < 7; t+=20) {
-        switch (t) {
+        switch (zone) {
         case 1: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff01.json");
             //pop_max_time = 6*60;
@@ -404,43 +702,186 @@ int main() {
             pop_max_time = get_maximal_parkingtime(&cfg);
             pop_min_price = get_minimal_parkingprice(&cfg);
             pop_max_price = get_maximal_parkingprice(&cfg);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
             qCritical() << "        pop_min_time: " << pop_min_time;
             qCritical() << "        pop_max_time: " << pop_max_time;
             qCritical() << "       pop_min_price: " << pop_min_price;
             qCritical() << "       pop_max_price: " << pop_max_price;
-            qCritical() << "pop_daily_card_price: " << cfg.getPaymentOptions().pop_daily_card_price;
+            qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
+            if (pop_min_time > pop_max_time) {
+                qCritical() << "ERROR pop_min_time > pop_max_time"
+                            << pop_min_time << pop_max_time;
+                return -1;
+            }
+
+            if (pop_min_price > pop_max_price) {
+                qCritical() << "ERROR pop_min_price > pop_max_price"
+                            << pop_min_price << pop_max_price;
+                return -1;
+            }
+
+            if (pop_daily_card_price < pop_max_price) {
+                qCritical() << "ERROR pop_daily_card_price < pop_max_price"
+                            << pop_daily_card_price << pop_max_price;
+                return -1;
+            }
+
+            QMap<int, int> m;
 
             {
                 // zone 1 (lila)
                 QDateTime s(QDate(2023, 11, 30), QTime());
                 QDateTime end;
                 int cnt = 1;
-#if 0
-                for (int duration = 15; duration <= pop_max_time; duration += 5) {
+#if 1
+                if (zone == 1) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price);
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 55);
+                    m.insert(25, 69);
+                    m.insert(30, 83);
+                    m.insert(35, 97);
+                    m.insert(40, 110);
+                    m.insert(45, 124);
+                    m.insert(50, 138);
+                    m.insert(55, 152);
+                    m.insert(60, 165);
+
+                    m.insert(65, 179);
+                    m.insert(70, 193);
+                    m.insert(75, 207);
+                    m.insert(80, 220);
+                    m.insert(85, 234);
+                    m.insert(90, 248);
+                    m.insert(95, 262);
+                    m.insert(100, 275);
+                    m.insert(105, 289);
+                    m.insert(110, 303);
+                    m.insert(115, 317);
+                    m.insert(120, 330);
+
+                    m.insert(125, 344);
+                    m.insert(130, 358);
+                    m.insert(135, 372);
+                    m.insert(140, 385);
+                    m.insert(145, 399);
+                    m.insert(150, 413);
+                    m.insert(155, 427);
+                    m.insert(160, 440);
+                    m.insert(165, 454);
+                    m.insert(170, 468);
+                    m.insert(175, 482);
+                    m.insert(180, 495);
+
+                    m.insert(185, 509);
+                    m.insert(190, 523);
+                    m.insert(195, 537);
+                    m.insert(200, 550);
+                    m.insert(205, 564);
+                    m.insert(210, 578);
+                    m.insert(215, 592);
+                    m.insert(220, 605);
+                    m.insert(225, 619);
+                    m.insert(230, 633);
+                    m.insert(235, 647);
+                    m.insert(240, 660);
+
+                    m.insert(245, 674);
+                    m.insert(250, 688);
+                    m.insert(255, 702);
+                    m.insert(260, 715);
+                    m.insert(265, 729);
+                    m.insert(270, 743);
+                    m.insert(275, 757);
+                    m.insert(280, 770);
+                    m.insert(285, 784);
+                    m.insert(290, 798);
+                    m.insert(295, 812);
+                    m.insert(300, 825);
+
+                    m.insert(305, 839);
+                    m.insert(310, 853);
+                    m.insert(315, 867);
+                    m.insert(320, 880);
+                    m.insert(325, 894);
+                    m.insert(330, 908);
+                    m.insert(335, 922);
+                    m.insert(340, 935);
+                    m.insert(345, 949);
+                    m.insert(350, 963);
+                    m.insert(355, 977);
+                    m.insert(360, pop_max_price);
+
+                    m.insert(365, pop_max_price);
+                    m.insert(370, pop_max_price);
+                    m.insert(375, pop_max_price);
+                    m.insert(380, pop_max_price);
+                    m.insert(385, pop_max_price);
+                    m.insert(390, pop_max_price);
+                    m.insert(395, pop_max_price);
+                    m.insert(400, pop_max_price);
+                    m.insert(405, pop_max_price);
+                    m.insert(410, pop_max_price);
+                    m.insert(415, pop_max_price);
+                    m.insert(420, pop_max_price);
+                } else
+                if (zone == 2) {
+
+                }
+
+                struct price_t price;
+                for (int duration = pop_min_time; duration <= pop_max_time; duration += 5) {
                     for (int offset = 480; offset < 1080; ++offset) {
                         QDateTime start = s.addSecs(offset * 60);
-                        // qCritical() << "start" << start.toString(Qt::ISODate);
+                        end = QDateTime();
+                        price.netto = 0;
+                        if (compute_price_for_parking_ticket(&cfg, start, duration, end, &price)) {
+                            double cost = price.netto;
 
-                        double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration);
-                        // Q_ASSERT(cost == duration*2.5);
-                        //qCritical() << "";
-                        qCritical() << cnt << "start" << start.toString(Qt::ISODate)
-                                    << "end" << end.toString(Qt::ISODate)
-                                    << "duration" << duration
-                                    << "cost" << cost;
+                            qCritical() << start.toString(Qt::ISODate) << end.toString(Qt::ISODate)
+                                        << duration << cost;
+
+                            //if (cost != m[duration]) {
+                            //    qCritical() << "ERROR computing_price_for_parking_ticket"
+                            //                << "duration" << duration
+                            //                << "HAVE cost" << cost
+                            //                << "SHOULD HAVE cost" << m[duration];
+                            //    return -1;
+                            //}
+                        } else {
+                            qCritical() << "ERROR computing_price_for_parking_ticket AT"
+                                        << cnt << "duration" << duration
+                                        << "start" << start.toString(Qt::ISODate);
+                            return -1;
+                        }
+                        start = s.addSecs(offset * 60);
+                        end = QDateTime();
+                        price.netto = 0;
+
+                        if (zone == 1) { // || zone == 2)
+                            if (compute_price_for_daily_ticket(&cfg, start, end, PERMIT_TYPE::DAY_TICKET, &price)) {
+                                if (price.netto != pop_daily_card_price) {
+                                    qCritical() << "ERROR computing_price_for_daily_ticket"
+                                                << "duration" << duration
+                                                << "HAVE cost" << price.netto
+                                                << "SHOULD HAVE cost" << pop_daily_card_price;
+                                    return -1;
+                                }
+                            } else {
+                                qCritical() << "ERROR computing_price_for_daily_ticket AT"
+                                            << "start" << start.toString(Qt::ISODate);
+                                return -1;
+                            }
+                        }
 
-                        std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg,
-                                                                                             3,
-                                                                                             start.toString(Qt::ISODate).toStdString().c_str(),
-                                                                                             cost, false, true);
-                        //Q_ASSERT(cost == duration*2.5);
-                        qCritical() << cnt << "start" << start.toString(Qt::ISODate)
-                                    << "cost" << cost
-                                    << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
                         ++cnt;
                     }
                 }
+
 #else
                 QDateTime start = s.addSecs(480 * 60); // 8:00:00
                 double cost = 2000;