tests for galtuer

GetTimeSteps(): return step-list as reference; return only a non-empty step-list.
Allow some tolerance when looking for a match for the first time-step
2024-07-13 13:57:32 +02:00 · 2024-07-13 13:57:07 +02:00 · 2024-07-13 13:55:24 +02:00 · 2024-07-13 13:53:53 +02:00 · 2024-07-05 12:02:27 +02:00
23 changed files with 1528 additions and 3298 deletions
--- a/library/include/mobilisis/calculate_price.h
+++ b/library/include/mobilisis/calculate_price.h
@@ -266,8 +266,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);

-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
-                                                int UpDown, PermitType const &permitType);
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);

 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);

@@ -298,8 +297,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // depre
                                            parking_tariff_t *tariff,
                                            time_t start_parking_time,
                                            time_t end_parking_time,
-                                            struct price_t *price,
-                                            PermitType permitType);
+                                            struct price_t *price);

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                            parking_tariff_t *tariff,
@@ -307,28 +305,24 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                            int netto_parking_time,
                                            QDateTime &end_parking_time,    // return value
                                            struct price_t *price,          // return value
-                                            PermitType permitType,
                                            bool prepaid = true);

 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
                                            parking_tariff_t *tariff,
                                            time_t start_parking_time,
                                            double cost,
-                                            QString &duration,
-                                            PermitType permitType);
+                                            QString &duration);

 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                            parking_tariff_t *tariff,
                                            QDateTime const &start_parking_time,
                                            double cost,
-                                            QDateTime &ticketEndTime,
-                                            PermitType permitType);      // return value
+                                            QDateTime &ticketEndTime);      // return value

 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                            parking_tariff_t *tariff,
                                            QDateTime const &start_parking_time,
-                                            QDateTime &ticketEndTime,
-                                            PermitType permitType);
+                                            QDateTime &ticketEndTime);

 CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
                                            parking_tariff_t *tariff,
--- a/library/include/mobilisis/calculator_functions.h
+++ b/library/include/mobilisis/calculator_functions.h
@@ -40,12 +40,12 @@ public:
    }

    void ResetTimeSteps(int paymentOptionIndex) {
-        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
+        if (m_timeSteps.size() > 0) {
            m_timeSteps[paymentOptionIndex].clear();
        }
    }
    QList<int> timeSteps(int paymentOptionIndex=0) const {
-        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
+        if (m_timeSteps.size() > 0) {
            return m_timeSteps[paymentOptionIndex];
        }
        return QList<int>();
@@ -70,8 +70,7 @@ 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,
-                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
+	std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price, bool nextDay = false, bool prepaid = false);

 	/// <summary>
 	///  Gets cost from duration in seconds
@@ -82,8 +81,7 @@ public:
    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
-                               PermitType permitType, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false);

    // Daily ticket
    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
@@ -93,10 +91,8 @@ public:
    // helper function to find time steps for a tariff with PaymentMethod::Steps
    // (e.g. Schoenau/Koenigsee)
    //
-    QList<int> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const {
-        return GetTimeSteps(cfg, paymentOptionIndex, start);
-    }
+    QList<int> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
+    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }

    QList<int> GetPriceSteps(Configuration *cfg) const;

@@ -119,7 +115,7 @@ public:
    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes, int paymentOptionIndex=0) const;
    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end, int paymentOptionIndex=0) const;

-private:
+// private:
    Ticket private_GetCostFromDuration(Configuration const* cfg,
                                       QDateTime const &start,
                                       int durationMinutes,
@@ -133,10 +129,10 @@ private:
                              int durationMinutes);

    //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
-    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-    //    return GetPriceForTimeStep(cfg, step, 0);
-    //}
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
+    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+        return GetPriceForTimeStep(cfg, step);
+    }
    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
    uint32_t GetStepForPrice(Configuration *cfg, int price) const {
        return GetDurationForPrice(cfg, price);
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -25,10 +25,6 @@
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
 #include "tariff_product.h"
-#include "tariff_interpolation.h"
-#include "tariff_prepaid.h"
-#include "tariff_carryover.h"
-#include "tariff_permit_type.h"

 #include <QVector>
 #include <optional>
@@ -45,16 +41,12 @@ public:
    using TimeRangeType = std::multimap<int, ATBTimeRange>;
    using TariffProductType = std::multimap<int, ATBTariffProduct>;
    using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
-    using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
-    using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
-    using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
-    using TariffDurationType = std::multimap<int, ATBDuration>;

    ATBProject project;
    ATBCurrency Currency;
 	ATBDuration duration;

-    TariffDurationType Duration;
+	multimap<int, ATBDuration> Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
    SpecialDaysWorktimeType SpecialDaysWorktime;
@@ -69,9 +61,6 @@ public:
    multimap<int, ATBTimeBase> TimeBase;
    multimap<int, ATBCustomer> Customer;
    TariffProductType TariffProduct;
-	TariffInterpolationType TariffInterpolations;
-	TariffPrepaidType TariffPrepaidOptions;
-	TariffCarryOverType TariffCarryOverOptions;

 	/// <summary>
 	/// Parse JSON string
@@ -93,28 +82,15 @@ public:
    bool isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime const &dt) const;
    bool isDayIncludedAsSpecialDay(uint64_t businessHours, int specialDayId) const;
    std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
-    std::optional<QVector<ATBPaymentOption>> getPaymentOptionsForAllKeys() const;
-    std::optional<ATBPaymentOption> getPaymentOptionForId(int key) const;
    std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
-    std::optional<ATBPaymentOption> getPaymentOptionForKey(PERMIT_TYPE permitType) const;
-    std::optional<ATBPaymentOption> getPaymentOptionForKey(int permitType) const;
-    std::optional<ATBPaymentOption> getPaymentOptionForKey(QString const &permitType) const;
    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
-    std::optional<ATBInterpolation> getInterpolationType(int type) const;
-    std::optional<QDateTime> getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const;
-    std::optional<ATBPrepaid> getPrepaidType(int type) 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<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
    std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
    std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
-    std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
-
-    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
-    int getPaymentOptionIndex(PERMIT_TYPE permitType);
-    int getPaymentOptionIndex(PERMIT_TYPE permitType) const;

 private:
 	/// <summary>
--- a/library/include/mobilisis/duration.h
+++ b/library/include/mobilisis/duration.h
@@ -1,40 +1,11 @@
 #include <string>

-#include <QDebug>
-
 class ATBDuration
 {
 public:
-    explicit ATBDuration()
-      : pun_id(0)
-      , pun_label("")
-      , pun_duration(0)
-      , pun_duration_saved(0)
-      , pun_duration_min(0)
-      , pun_duration_max(0)
-      , pun_interpolation_id(-1) {
-    }
-
-    friend QDebug operator<<(QDebug debug, ATBDuration const &td) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "              pun_id: " << td.pun_id << "\n"
-            << "           pun_label: " << QString::fromStdString(td.pun_label) << "\n"
-            << "        pun_duration: " << td.pun_duration << "\n"
-            << "  pun_duration_saved: " << td.pun_duration_saved << "\n"
-            << "    pun_duration_min: " << td.pun_duration_min << "\n"
-            << "    pun_duration_max: " << td.pun_duration_max << "\n"
-            << "pun_interpolation_id: " << td.pun_interpolation_id << "\n";
-
-        return debug;
-    }
-
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
-    int pun_duration_saved;
    int pun_duration_min;
    int pun_duration_max;
-    int pun_interpolation_id;
 };
--- a/library/include/mobilisis/member_type.h
+++ b/library/include/mobilisis/member_type.h
@@ -19,10 +19,7 @@ enum MemberType
    TimeBaseType = 0x0C,
    TimeRangeType = 0x0D,
    TimeStepConfigType = 0x0E,
-    ProductType = 0x0F,
-    InterpolationType = 0x10,
-    PrepaidType = 0x11,
-    CarryOverType = 0x12
+    ProductType = 0x0F
 };

 #endif // MEMBER_TYPE_H_INCLUDED
--- a/library/include/mobilisis/payment_opt.h
+++ b/library/include/mobilisis/payment_opt.h
@@ -15,8 +15,6 @@ public:
    void reset() {
        pop_id = 0;
        pop_label = "";
-        pop_product_id = -1;
-        pop_product_name = "";
        pop_payment_method_id = 0;
        pop_day_end_time = "";
        pop_day_night_end_time = "";
@@ -26,31 +24,22 @@ public:
        pop_min_price = 0;
        pop_max_price = 0;
        pop_carry_over = -1;
-        pop_carry_over_option_id = -1;
-        pop_prepaid_option_id = -1;
-        pop_truncate_last_interpolation_step = false;
-        pop_accumulate_prices = false;
-        pop_accumulate_durations = false;
        pop_carry_over_target = false;
        pop_carry_over_time_range_id = -1;
        pop_carry_over_start_time_range = -1;
        pop_carry_over_end_time_range = -1;
+        pop_prepay = false;
+        pop_prepay_time_range_id = -1;
+        pop_prepay_over_start_time_range = -1;
+        pop_prepay_end_time_range = -1;
        pop_daily_card_price = -1;
        pop_business_hours = -1;
        pop_time_step_config = -1;
-        pop_use_only_upto_datetime = ""; // deprecated
-        pop_use_only_for_duration = 0;   // deprecated
-        pop_plus_steps = 1;  // +: jump <x=1> steps forward
-        pop_minus_steps = 1; // -: jump <x=1> steps backward
    }

    int pop_id;
    std::string pop_label;
-    int pop_product_id;
-    QString pop_product_name;
    int pop_payment_method_id;
-    QString pop_use_only_upto_datetime;
-    int pop_use_only_for_duration;
    std::string pop_day_end_time;
    std::string pop_day_night_end_time;
    double pop_price_night;
@@ -59,20 +48,17 @@ public:
    double pop_min_price;
    double pop_max_price;
    int pop_carry_over;
-    int pop_carry_over_option_id;
-    bool pop_truncate_last_interpolation_step;
-    int pop_prepaid_option_id;
    bool pop_carry_over_target;
    int pop_carry_over_time_range_id;
    int pop_carry_over_start_time_range;
    int pop_carry_over_end_time_range;
+    bool pop_prepay;
+    int pop_prepay_time_range_id;
+    int pop_prepay_over_start_time_range;
+    int pop_prepay_end_time_range;
    int pop_daily_card_price;
    uint64_t pop_business_hours;
    int pop_time_step_config;
-    bool pop_accumulate_prices;
-    bool pop_accumulate_durations;
-    int pop_plus_steps;
-    int pop_minus_steps;

    struct ATBMaxDateTime {
        int direction;
--- a/library/include/mobilisis/tariff_carryover.h
+++ b/library/include/mobilisis/tariff_carryover.h
@@ -1,76 +0,0 @@
-#ifndef TARIFF_CARRYOVER_H_INCLUDED
-#define TARIFF_CARRYOVER_H_INCLUDED
-
-#include <QTime>
-
-struct ATBCarryOver {
-    struct week {
-        int day;
-        bool seemless;
-        bool never;
-        QTime static_start;
-        QTime static_end;
-        int duration;
-    } carryover[8];
-
-    int id;
-
-    friend QDebug operator<<(QDebug debug, ATBCarryOver const &co) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "                 id:" << co.id << "\n"
-            << "        **** Monday **** \n"
-            << "                day: " << co.carryover[(int)Qt::Monday].day << "\n"
-            << "       static_start: " << co.carryover[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
-            << "         static_end: " << co.carryover[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
-            << "            anytime: " << co.carryover[(int)Qt::Monday].seemless << "\n"
-            << "              never: " << co.carryover[(int)Qt::Monday].never << "\n"
-            << "        **** Tuesday **** \n"
-            << "                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"
-            << "            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"
-            << "            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"
-            << "            anytime: " << co.carryover[(int)Qt::Thursday].seemless << "\n"
-            << "              never: " << co.carryover[(int)Qt::Thursday].never << "\n"
-            << "        **** Friday **** \n"
-            << "                day: " << co.carryover[(int)Qt::Friday].day << "\n"
-            << "       static_start: " << co.carryover[(int)Qt::Friday].static_start.toString(Qt::ISODate) << "\n"
-            << "         static_end: " << co.carryover[(int)Qt::Friday].static_end.toString(Qt::ISODate) << "\n"
-            << "            anytime: " << co.carryover[(int)Qt::Friday].seemless << "\n"
-            << "              never: " << co.carryover[(int)Qt::Friday].never << "\n"
-            << "        **** Saturday **** \n"
-            << "                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"
-            << "            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"
-            << "            anytime: " << co.carryover[(int)Qt::Sunday].seemless << "\n"
-            << "              never: " << co.carryover[(int)Qt::Sunday].never << "\n";
-
-        return debug;
-    }
-};
-
-#endif // TARIFF_CARRYOVER_H_INCLUDED
--- a/library/include/mobilisis/tariff_global_defines.h
+++ b/library/include/mobilisis/tariff_global_defines.h
@@ -3,18 +3,4 @@

 #define DBG_HEADER "(" << __func__ << ":" << __LINE__ << ")"

-#define DBG_EMERGENCY   (0) // System is unusable
-#define DBG_ALERT       (1) // Action must be taken immediately
-#define DBG_CRITICAL    (2) // Critical conditions
-#define DBG_ERROR       (3) // Error conditions
-#define DBG_WARNING     (4) // Warning conditions
-#define DBG_NOTICE      (5) // Normal but significant conditions
-                            // Conditions that are not error conditions, but that may require special handling
-#define DBG_INFORMATION (6) // Informational messages
-                            // Confirmation that the program is working as expected
-#define DBG_DEBUG       (7) // Debug-level messages
-                            // Messages that contain information normally of use only when debugging a program
-
-extern int DBG_LEVEL;
-
 #endif // TARIFF_GLOBAL_DEFINES_H_INCLUDED
--- a/library/include/mobilisis/tariff_interpolation.h
+++ b/library/include/mobilisis/tariff_interpolation.h
@@ -1,95 +0,0 @@
-#ifndef TARIFF_INTERPOLATION_H_INCLUDED
-#define TARIFF_INTERPOLATION_H_INCLUDED
-
-#include <QTime>
-#include <QString>
-
-struct ATBInterpolation {
-
-    enum Type {
-        NO_INTERPOLATION = 1,
-        STATIC_WALLCLOCK_TIME_VALUES = 2,
-        STATIC_TIMEPOINT_AND_DURATION = 3,
-        DYNAMIC_TIMEPOINT_AND_STATIC_DURATION = 4,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION = 5,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE = 6,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME = 7
-    };
-
-    static QString name(int i) {
-        switch(i) {
-        case (int)(NO_INTERPOLATION):
-            return QString("%1: NO_INTERPOLATION").arg(i);
-        case (int)(STATIC_WALLCLOCK_TIME_VALUES):
-            return QString("%1: STATIC_WALLCLOCK_TIME_VALUES").arg(i);
-        case (int)(STATIC_TIMEPOINT_AND_DURATION):
-            return QString("%1: STATIC_TIMEPOINT_AND_DURATION").arg(i);
-        case (int)(DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
-            return QString("%1: DYNAMIC_TIMEPOINT_AND_STATIC_DURATION").arg(i);
-        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION").arg(i);
-        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE").arg(i);
-        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME").arg(i);
-        default:;
-        }
-        return "ERROR";
-    }
-
-    explicit ATBInterpolation()
-      : id(0)
-      , static_start(QTime())
-      , static_end(QTime())
-      , static_start_str(QString())
-      , static_end_str(QString())
-      , static_duration(0)
-      , dynamic_start(QTime())
-      , dynamic_end(QTime())
-      , dynamic_start_str(QString())
-      , dynamic_end_str(QString())
-      , dynamic_duration(0)
-      , dynamic_until_price(0)
-      , seemless(false)
-      , never(false) {
-    }
-
-    int id;
-    QTime static_start;
-    QTime static_end;
-    QString static_start_str;
-    QString static_end_str;
-    int static_duration;
-    QTime dynamic_start;
-    QTime dynamic_end;
-    QString dynamic_start_str;
-    QString dynamic_end_str;
-    int dynamic_duration;
-    int dynamic_until_price;
-    bool seemless;
-    bool never;
-
-    friend QDebug operator<<(QDebug debug, ATBInterpolation const &i) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "                 id: " << name(i.id) << "\n"
-            << "       static_start: " << i.static_start.toString(Qt::ISODate) << "\n"
-            << "         static_end: " << i.static_end.toString(Qt::ISODate) << "\n"
-            << "   static_start_str: " << i.static_start_str << "\n"
-            << "     static_end_str: " << i.static_end_str << "\n"
-            << "    static_duration: " << i.static_duration << "\n"
-            << "      dynamic_start: " << i.dynamic_start.toString(Qt::ISODate) << "\n"
-            << "        dynamic_end: " << i.dynamic_end.toString(Qt::ISODate) << "\n"
-            << "  dynamic_start_str: " << i.dynamic_start_str << "\n"
-            << "    dynamic_end_str: " << i.dynamic_end_str << "\n"
-            << "   dynamic_duration: " << i.dynamic_duration << "\n"
-            << "dynamic_until_price: " << i.dynamic_until_price << "\n"
-            << "           seemless: " << i.seemless << "\n"
-            << "              never: " << i.never << "\n";
-
-        return debug;
-    }
-};
-
-#endif // TARIFF_INTERPOLATION_H_INCLUDED
--- a/library/include/mobilisis/tariff_permit_type.h
+++ b/library/include/mobilisis/tariff_permit_type.h
@@ -13,13 +13,7 @@ enum class PERMIT_TYPE : quint8 {
    DAY_TICKET_CHILD=6,
    INVALID=7,
    FOOD_STAMP=8,
-    TWENTY_FOUR_HOURS_TICKET=9,
-    SHORT_TERM_PARKING_PKW=10,
-    SHORT_TERM_PARKING_BUS=11,
-    SHORT_TERM_PARKING_CAMPER=12,
-    DAY_TICKET_PKW=13,
-    DAY_TICKET_BUS=14,
-    DAY_TICKET_CAMPER=15
+    TWENTY_FOUR_HOURS_TICKET=9
 };

 struct PermitType {
@@ -49,30 +43,12 @@ struct PermitType {
        case 6:
            m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
            break;
-        case 8:
+        case 7:
            m_permitType = PERMIT_TYPE::FOOD_STAMP;
            break;
-        case 9:
+        case 8:
            m_permitType = PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
            break;
-        case 10:
-            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
-            break;
-        case 11:
-            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
-            break;
-        case 12:
-            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
-            break;
-        case 13:
-            m_permitType = PERMIT_TYPE::DAY_TICKET_PKW;
-            break;
-        case 14:
-            m_permitType = PERMIT_TYPE::DAY_TICKET_BUS;
-            break;
-        case 15:
-            m_permitType = PERMIT_TYPE::DAY_TICKET_CAMPER;
-            break;
        default:
            m_permitType = PERMIT_TYPE::INVALID;
        }
@@ -101,78 +77,14 @@ struct PermitType {
        case PERMIT_TYPE::DAY_TICKET_TEEN:
            return 6;
        case PERMIT_TYPE::FOOD_STAMP:
-            return 8;
+            return 7;
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
-            return 9;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return 10;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return 11;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return 12;
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return 13;
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return 14;
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return 15;
+            return 8;
        default:
            break;
        }
        return 7;
-    }

-    static PERMIT_TYPE toPermitType(QString const permitTypeStr) {
-        if (permitTypeStr == "DAY_TICKET") {
-            return PERMIT_TYPE::DAY_TICKET;
-        } else
-        if (permitTypeStr == "DAY_TICKET_ADULT") {
-            return PERMIT_TYPE::DAY_TICKET_ADULT;
-        } else
-        if (permitTypeStr == "DAY_TICKET_CHILD") {
-            return PERMIT_TYPE::DAY_TICKET_CHILD;
-        } else
-        if (permitTypeStr == "DAY_TICKET_ADULT") {
-            return PERMIT_TYPE::DAY_TICKET_ADULT;
-        } else
-        if (permitTypeStr == "DAY_TICKET_TEEN") {
-            return PERMIT_TYPE::DAY_TICKET_TEEN;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING;
-        } else
-        if (permitTypeStr == "SZEGED_START") {
-            return PERMIT_TYPE::SZEGED_START;
-        } else
-        if (permitTypeStr == "SZEGED_STOP") {
-            return PERMIT_TYPE::SZEGED_STOP;
-        } else
-        if (permitTypeStr == "FOOD_STAMP") {
-            return PERMIT_TYPE::FOOD_STAMP;
-        } else
-        if (permitTypeStr == "TWENTY_FOUR_HOURS_TICKET") {
-            return PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING_PKW") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING_BUS") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING_CAMPER") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
-        } else
-        if (permitTypeStr == "DAY_TICKET_PKW") {
-            return PERMIT_TYPE::DAY_TICKET_PKW;
-        } else
-        if (permitTypeStr == "DAY_TICKET_BUS") {
-            return PERMIT_TYPE::DAY_TICKET_BUS;
-        } else
-        if (permitTypeStr == "DAY_TICKET_CAMPER") {
-            return PERMIT_TYPE::DAY_TICKET_CAMPER;
-        }
-
-        return PERMIT_TYPE::INVALID;
    }

    QString toString() {
@@ -195,18 +107,6 @@ struct PermitType {
            return QString("FOOD_STAMP");
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return QString("TWENTY_FOUR_HOURS_TICKET");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return QString("SHORT_TERM_PARKING_PKW");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return QString("SHORT_TERM_PARKING_BUS");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return QString("SHORT_TERM_PARKING_CAMPER");
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return QString("DAY_TICKET_PKW");
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return QString("DAY_TICKET_BUS");
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return QString("DAY_TICKET_CAMPER");
        default:
            break;
        }
@@ -233,18 +133,6 @@ struct PermitType {
            return QString("FOOD_STAMP");
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return QString("TWENTY_FOUR_HOURS_TICKET");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return QString("SHORT_TERM_PARKING_PKW");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return QString("SHORT_TERM_PARKING_BUS");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return QString("SHORT_TERM_PARKING_CAMPER");
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return QString("DAY_TICKET_PKW");
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return QString("DAY_TICKET_BUS");
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return QString("DAY_TICKET_CAMPER");
        default:
            break;
        }
--- a/library/include/mobilisis/tariff_prepaid.h
+++ b/library/include/mobilisis/tariff_prepaid.h
@@ -1,29 +0,0 @@
-#ifndef TARIFF_PREPAID_H_INCLUDED
-#define TARIFF_PREPAID_H_INCLUDED
-
-#include <QTime>
-#include <QString>
-
-struct ATBPrepaid {
-    explicit ATBPrepaid() = default;
-    int id;
-    bool anytime;
-    bool never;
-    QTime static_start;
-    QTime static_end;
-
-    friend QDebug operator<<(QDebug debug, ATBPrepaid const &pp) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "                 id: " << pp.id << "\n"
-            << "       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";
-
-        return debug;
-    }
-};
-
-#endif // TARIFF_PREPAID_H_INCLUDED
--- a/library/include/mobilisis/utilities.h
+++ b/library/include/mobilisis/utilities.h
@@ -3,7 +3,6 @@
 #include <ctime>
 #include <iostream>
 #include <cmath>
-#include <optional>

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

 	/// <summary>
 	/// Check permissions
--- a/library/include/mobilisis/weekdays_worktime.h
+++ b/library/include/mobilisis/weekdays_worktime.h
@@ -5,8 +5,6 @@ class ATBWeekDaysWorktime
 {
 public:
 	int pwd_id;
-    int pwd_pop_id;
-    int pwd_next_id;
 	int pwd_period_week_day_id;
 	int pwd_period_day_in_week_id;
 	std::string pwd_time_from;
--- a/library/library.pro
+++ b/library/library.pro
@@ -34,8 +34,7 @@ SOURCES += \
    src/configuration.cpp \
    src/tariff_log.cpp \
    src/calculate_price.cpp \
-    src/ticket.cpp \
-    src/tariff_global_defines.cpp
+    src/ticket.cpp

 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -85,10 +84,6 @@ HEADERS += \
    include/mobilisis/tariff_timestep_config.h \
    include/mobilisis/tariff_product.h \
    include/mobilisis/tariff_permit_type.h \
-    include/mobilisis/tariff_global_defines.h \
-    include/mobilisis/tariff_interpolation.h \
-    include/mobilisis/tariff_prepaid.h \
-    include/mobilisis/tariff_carryover.h \
    include/mobilisis/tariff_global_defines.h

 OTHER_FILES += src/main.cpp \
--- a/library/src/calculate_price.cpp
+++ b/library/src/calculate_price.cpp
@@ -3,8 +3,6 @@
 #include "calculator_functions.h"
 #include "payment_option.h"
 #include "utilities.h"
-#include "tariff_global_defines.h"
-#include "period_year.h"

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

-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
-
-    qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
-    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
-
    switch(permitType) {
    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
-        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
        minTime = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
-        qCritical() << __func__ << __LINE__ << minTime;
    } break;
    case PERMIT_TYPE::DAY_TICKET_ADULT: {
    } break;
@@ -57,19 +48,16 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
        // for each new sell-procedure, recomute the timesteps. implicitly, set
        // the minimal parking time.
        Calculator::GetInstance().ResetTimeSteps(paymentOptionIndex);
-        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
+        Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
        minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
    }

-    qCritical() << "minTime" << minTime;
    return minTime;
 }

 int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                  PERMIT_TYPE permitType,
                                                  int paymentOptionIndex) {
-
-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
    int maxTime = 0;

    switch(permitType) {
@@ -83,10 +71,10 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
    case PERMIT_TYPE::DAY_TICKET_CHILD: {
    } break;
    default: ;
-        maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
    }

    return maxTime;
+
 }

 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
@@ -94,42 +82,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                   int paymentOptionIndex,
                                                   QDateTime const &start) {
    int minPrice = -1;
-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);

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

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

            if (product.size() > 0) {
                if (productStart && productEnd) {
-                    int pop_min_time = get_minimal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
-                    int pop_max_time = get_maximal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
+                    int pop_min_time = get_minimal_parkingtime(cfg); // in minutes
+                    int pop_max_time = get_maximal_parkingtime(cfg); // in minutes
                    if (pop_max_time >= pop_min_time) {
                        *productStart = start;
                        *productEnd = start.addSecs(pop_max_time*60);
@@ -262,52 +213,6 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
        }

    } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
-        PermitType p(permitType);
-        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
-        if (paymentOption.has_value()) {
-            ATBPaymentOption option = paymentOption.value();
-            int const pop_daily_card_price = option.pop_daily_card_price;
-            qCritical() << "SHORT_TERM_PARKING_PKW: daily ticket price" << pop_daily_card_price;
-            return pop_daily_card_price;
-        }
-    } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
-        qCritical() << "TODO: SHORT_TERM_PARKING_BUS";
-    } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER: {
-        qCritical() << "TODO: SHORT_TERM_PARKING_CAMPER";
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_PKW: {
-        PermitType p(permitType);
-        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
-        if (paymentOption.has_value()) {
-            ATBPaymentOption option = paymentOption.value();
-            int const pop_daily_card_price = option.pop_daily_card_price;
-            qCritical() << "DAY_TICKET_PKW: daily ticket price" << pop_daily_card_price;
-            return pop_daily_card_price;
-        }
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_BUS: {
-        PermitType p(permitType);
-        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
-        if (paymentOption.has_value()) {
-            ATBPaymentOption option = paymentOption.value();
-            int const pop_daily_card_price = option.pop_daily_card_price;
-            qCritical() << "DAY_TICKET_BUS: daily ticket price" << pop_daily_card_price;
-            return pop_daily_card_price;
-        }
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_CAMPER: {
-        PermitType p(permitType);
-        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
-        if (paymentOption.has_value()) {
-            ATBPaymentOption option = paymentOption.value();
-            int const pop_daily_card_price = option.pop_daily_card_price;
-            qCritical() << "DAY_TICKET_CAMPER: daily ticket price" << pop_daily_card_price;
-            return pop_daily_card_price;
-        }
-    } break;
    default:
      break;
    }
@@ -321,8 +226,6 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
    int maxPrice = -1;
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
-
    switch(permitType) {
    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
        if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
@@ -346,28 +249,6 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
        break;
    case PERMIT_TYPE::DAY_TICKET_CHILD:
        break;
-    case PERMIT_TYPE::DAY_TICKET_BUS:
-        break;
-    case PERMIT_TYPE::DAY_TICKET_CAMPER:
-        break;
-    case PERMIT_TYPE::DAY_TICKET_PKW:
-        break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
-        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
-        if (po.has_value()) {
-            ATBPaymentOption option = po.value();
-            return option.pop_max_price;
-        }
-    } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
-        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
-        if (po.has_value()) {
-            ATBPaymentOption option = po.value();
-            return option.pop_max_price;
-        }
-    } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-        break;
    default: ;
    }

@@ -437,13 +318,11 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
        if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
            delete *tariff;
            *tariff = nullptr;
-            qCritical() << "      ... error parsing tariff";
            return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
        }
    } else {
        delete *tariff;
        *tariff = nullptr;
-            qCritical() << "      ... error loading tariff";
        return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
    }

@@ -460,27 +339,10 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {

 //
 // UpDown 1 -> up; 0 -> down
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
-                                                int UpDown, PermitType const &permitType)
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
 {
-
-    qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
-    qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
-
-    // FIXME
-    //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
-    //if (!paymentOption.has_value()) {
-    //    qCritical() << "   compute_next_timestep() ERROR";
-    //    return currentTimeMinutes;
-    //}
-
-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    int const &pop_plus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_plus_steps;
-    int const &pop_minus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_minus_steps;
-
-    qCritical() << __LINE__ << "compute_next_timestep()   payment option index: " << paymentOptionIndex;
-    qCritical() << __LINE__ << "compute_next_timestep()             plus steps: " << pop_plus_steps;
-    qCritical() << __LINE__ << "compute_next_timestep()            minus steps: " << pop_minus_steps;
+    qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
+    qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;

    Configuration const *cfg = tariff;

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

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

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

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

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

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

        if (UpDown == 1) { // UP
            if (stepList[currentStepIndex] == stepList.last()) {
-                qCritical() << __LINE__ << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                return  currentTimeMinutes;
            }
            else {
-                int const rest = currentStepIndex % pop_plus_steps;
-
-                if (rest) {
-                    currentStepIndex -= rest;
-                }
-
-                qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
-
-                int const nextStepIndex = currentStepIndex + pop_plus_steps;
-
-                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
-                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
-                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
-                    return stepList[nextStepIndex];
-                }
+                return stepList[currentStepIndex + 1];
            }
        }
        if (UpDown == 0) { // DOWN
            if (stepList[currentStepIndex] == stepList.first()) {
-                qCritical() << __LINE__ << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                return  currentTimeMinutes;
            }
            else {
-                int const nextStepIndex = currentStepIndex - pop_minus_steps;
-                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
-                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
-                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
-                    return stepList[nextStepIndex];
-                }
+                return stepList[currentStepIndex - 1];
            }
        }
    } else
@@ -649,15 +462,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        parking_tariff_t *tariff,
        time_t start_parking_time, // in minutes
        time_t end_parking_time,   // netto time in minutes
-        struct price_t *price,
-        PermitType permitType) {    // permitType maps to product
-
+        struct price_t *price) {
    CalcState calcState;
-
-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
-
-    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_max_time;
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;

    if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
        calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -690,13 +498,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
    if (start.isValid()) {
        double cost = Calculator::GetInstance().GetCostFromDuration(
                    tariff,
-                    tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                    start,
                    end,
                    duration, false, true);
-        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
        if (cost < minCost) {
-            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
        }
        price->units = cost;
@@ -710,18 +518,15 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        parking_tariff_t *tariff,
-        QDateTime &start_parking_time_,
+        QDateTime &start_parking_time,
        int netto_parking_time,
        QDateTime &end_parking_time,
        struct price_t *price,
-        PermitType permitType,
        bool prepaid)
 {
    CalcState calcState;

-    QDateTime start_parking_time(start_parking_time_);
-
-    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    int paymentOptionIndex = tariff->getPaymentOptionIndex(start_parking_time);

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

    if (netto_parking_time < 0) {
        calcState.setDesc(QString("end=%1, start=%2")
@@ -757,69 +560,20 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

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

-            int weekDay = start_parking_time.date().dayOfWeek();
-            int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-            qCritical() << __func__ << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;
-
-            std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
-            if (yperiod.has_value()) {
-                ATBPeriodYear const &period = yperiod.value();
-                pop_carry_over_option_id = period.pye_id;
-                qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
-            }
-
-            QTime const 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;
-
-            qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
-
-            // handle prepaid option
-            QDateTime effectiveStartTime(start_parking_time);
-            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
-            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
-            if (prepaidOption.has_value()) {
-                ATBPrepaid const &p = prepaidOption.value();
-                if (p.never) {
-                    qCritical() << __func__ << __LINE__ << "prepaid: no";
-                } else {
-                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
-                        effectiveStartTime.setTime(p.static_end);
-                    } else
-                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
-                        effectiveStartTime.setTime(p.static_start);
-                    }
-                }
-            }
-
-            // handle carry over
-            int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
-            if (netto_parking_time > minutesUntilCarryOver) {
-                int const rest = netto_parking_time - minutesUntilCarryOver;
-                QDateTime s(effectiveStartTime);
-                s = s.addSecs(minutesUntilCarryOver * 60);
-                s = s.addSecs(carryOverDuration * 60);
-                end_parking_time = s.addSecs(rest * 60);
-            } else {
-                end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
-            }
+            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+            //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);

        } else {
            cost = Calculator::GetInstance().GetCostFromDuration(
@@ -830,16 +584,15 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                        netto_parking_time,         // minutes, netto
                        false, prepaid);
        }
-        // qCritical() << __func__ << __LINE__;
        double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
        if (cost < minCost) {
-            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
        }

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

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

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

@@ -862,8 +609,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        parking_tariff_t *tariff,
        time_t start_parking_time,
        double price,
-        QString &duration,
-        PermitType permitType) {
+        QString &duration) {
    CalcState calcState;
    QDate const d(1970, 1, 1);
    QTime const t(0, 0, 0);
@@ -872,25 +618,15 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    if (start.isValid()) {
        QString cs = start.toString(Qt::ISODate);

-        bool prepaid = true;
-        int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-        int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
-        if (prepaid_option_id == 2) { // see tariff03.json for 502: 2 means no prepaid-option
-            prepaid = false;
-        }
-        bool const nextDay = false;
-
        // DEBUG
-        qCritical() << "compute_duration_for_parking_ticket(1): ";
-        qCritical() << " payment option index: " << paymentOptionIndex;
-        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "compute_duration_for_parking_ticket(): ";
        qCritical() << "      start (cs): " << cs;
        qCritical() << "           price: " << price;

        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
-                                                  tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
+                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                  cs.toLocal8Bit().constData(),
-                                                  price, permitType, nextDay, prepaid).c_str();
+                                                  price, false, true).c_str();
        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
        if (!d.isValid()) {
            calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -907,34 +643,16 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        parking_tariff_t *tariff,
        QDateTime const &start_parking_time,
        double price,
-        QDateTime &ticketEndTime,
-        PermitType permitType)
+        QDateTime &ticketEndTime)
 {
    CalcState calcState;
-
-    bool prepaid = true;
-    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
-    if (prepaid_option_id == 2) {
-        prepaid = false;
-    }
-    bool const nextDay = false;
-
-    // DEBUG
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "compute_duration_for_parking_ticket(2): ";
-        qCritical() << " payment option index: " << paymentOptionIndex;
-        qCritical() << "              prepaid: " << prepaid;
-        qCritical() << "                price: " << price;
-    }
-
    if (start_parking_time.isValid()) {
        QString cs = start_parking_time.toString(Qt::ISODate);
        QString endTime = Calculator::GetInstance().GetDurationFromCost(
                    tariff,
                    tariff->getPaymentOptions().pop_payment_method_id,
                    cs.toLocal8Bit().constData(),
-                    price, permitType, nextDay, prepaid).c_str();
+                    price, false, true).c_str();

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

+            // DEBUG
+            //qCritical() << "compute_duration_for_parking_ticket(): ";
+            //qCritical() << "                 endTime: " << endTime;
+            //qCritical() << "           ticketEndTime: " << ticketEndTime;
+
            if (!ticketEndTime.isValid()) {
                calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
                return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
            }
-
-            if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
-                ticketEndTime = ticketEndTime.addDays(-1);
-                ticketEndTime.setTime(QTime(23, 59, 0));
-            }
-
-            // DEBUG
-            qCritical() << "compute_duration_for_parking_ticket(): ";
-            qCritical() << "                 endTime: " << endTime;
-            qCritical() << "           ticketEndTime: " << ticketEndTime;
        }
    } else {
        return calcState.set(CalcState::State::INVALID_START_DATE);
@@ -1018,10 +731,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    return calcState.set(CalcState::State::SUCCESS);
 }

-CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff,
-                                                                  QDateTime const &start_parking_time,
-                                                                  QDateTime &ticketEndTime,
-                                                                  PermitType PermitType)
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
 {
    CalcState calcState;
    if (start_parking_time.isValid()) {
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
--- a/library/src/calculator_functions.cpp.kirchdorf
+++ b/library/src/calculator_functions.cpp.kirchdorf
@@ -115,8 +115,8 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
 /// <inheritdoc/>
 std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                            uint8_t payment_option,
-                                            char const *startDatetimePassed, // given in local time
-                                            double cost,
+                                            char const* start_datetime, // given in local time
+                                            double price,
                                            bool nextDay,
                                            bool prepaid)
 {
@@ -124,14 +124,14 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
    Q_UNUSED(nextDay);

    // Get input date
-    QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
+    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);

    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
    if (paymentMethodId == PaymentMethod::Steps) {
        if (tariffIs24_7(cfg)) {
            // use tariff with structure as for instance Schoenau, Koenigsee:
            // without given YearPeriod, SpecialDays and SpecialDaysWorktime
-            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
+            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
            return inputDate.toString(Qt::ISODate).toStdString();
        } else {
            if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
@@ -147,226 +147,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                return "";
            }
        }
-    } else
-    if (paymentMethodId == PaymentMethod::Progressive) {
-        // started with Neuhauser, Kirchdorf: merge into main algo. later
-        // for now try out some ideas
-
-        // started with Neuhauser, Kirchdorf: merge into main algo. later
-        // for now try out some ideas
-
-        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)");
-
-        QDateTime start_datetime = QDateTime::fromString(QString(startDatetimePassed), Qt::ISODate);
-        QDateTime start = start_datetime;
-        QDateTime end_datetime = QDateTime();
-
-        int weekdayId = -1;
-        int weekdayIdLast = -1;
-        int durationMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
-        int durationMinutesBrutto = 0;
-
-        QDateTime current = start;
-
-        int days = 7;
-        while (--days > 0) {
-            weekdayId = current.date().dayOfWeek();
-            weekdayIdLast = weekdayId; // TODO: some end condition in json-file
-
-            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
-                current = current.addDays(1);
-                weekdayId = current.date().dayOfWeek();
-                if (weekdayId == weekdayIdLast) {
-                    qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
-                    return QDateTime().toString(Qt::ISODate).toStdString();
-                }
-            }
-
-            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
-
-            QTime to = QTime(0, 0, 0);
-            for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);
-
-                if (to < t) {
-                    to = t;
-                }
-            }
-
-            if (current.time() >= to) {
-                if (carryOverNotSet) {
-                    return end_datetime.toString(Qt::ISODate).toStdString();
-                } else {
-                    QDateTime const dt = start;
-                    start = start.addDays(1);
-                    start.setTime(QTime(0, 0, 0));
-
-                    durationMinutesBrutto += dt.secsTo(start) / 60;
-                    current = start;
-                }
-            } else {
-                break;
-            }
-        }
-
-        int durationMinutesNetto = 0;
-        uint price = 0;
-
-        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();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
-                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
-
-                for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                    ++range;
-
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
-
-                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
-
-                    if (current.time() >= to) {
-                        continue; // try to use next available work-time
-                    } else
-                    if (current.time() <= from) {
-                        if (prepaid) {
-                            lastCurrent = current;
-                            current.setTime(from); // move current forward (range==1),
-                                                   // as prepaid is set
-                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                            durationMinutesBrutto += minutesMoved;
-
-                            if (range == 1) {
-                                start_datetime = current;
-                            }
-                        }
-                    }
-
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
-                        ATBTimeRange timeRange = timeRangeIt->second;
-
-                        timeRange.computeQTimes(current.time());
-
-                        int duration = timeRange.time_range_to_in_minutes_from_start -
-                                       timeRange.time_range_from_in_minutes_from_start;
-
-                        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;
-
-                                        current = current.addSecs(duration * 60);
-
-                                        if (price >= cost) {
-                                            end_datetime = current;
-                                            return end_datetime.toString(Qt::ISODate).toStdString();
-                                        }
-
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (durationMinutes <= 0) {
-                                end_datetime = current;
-                                return end_datetime.toString(Qt::ISODate).toStdString();
-                            }
-
-                            ++timeRangeIt;
-
-                        } else {
-
-                            lastCurrent = current;
-                            current.setTime(to);
-                            minsUsed = lastCurrent.secsTo(current) / 60;
-
-                            // mod duration: possibly discard some minutes in
-                            // the next time-range
-                            if (durationMinutes >= minsUsed) {
-                                minsToCarryOver = durationMinutes - minsUsed;
-                            }
-
-                            durationMinutes -= minsUsed;
-                            durationMinutesNetto += minsUsed;
-                            durationMinutesBrutto += minsUsed;
-
-                            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();
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        }
-                    }
-                }
-
-                end_datetime = start.addSecs(durationMinutesBrutto * 60);
-                return end_datetime.toString(Qt::ISODate).toStdString();
-            }
-        }
-
-        end_datetime = QDateTime();
-        return end_datetime.toString(Qt::ISODate).toStdString();
-    }
-
-    Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);

    // qCritical().noquote() << t;

@@ -496,11 +279,9 @@ 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() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
+
+                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
                end_datetime = QDateTime();
                return 0;
            }
@@ -518,18 +299,34 @@ double Calculator::GetCostFromDuration(Configuration* cfg,

        QDateTime start = start_datetime;

+#define DEBUG 0
+#if DEBUG==1
+        qCritical() << "start" << start.toString(Qt::ISODate) << durationMinutes;
+#endif
        int weekdayId = -1;
        int weekdayIdLast = -1;
+        int timeRanges = 0;
        int durationMinutesBrutto = 0;

        QDateTime current = start;

+        //if ((durationMinutes % 5) != 0) {
+        //    qCritical() << "ERROR DURATION (" << durationMinutes
+        //                << ") NOT A MULTIPLE Of 5";
+        //}
+
        int days = 7;
        while (--days > 0) {
+
+#if DEBUG==1
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                    << "start" << start.toString(Qt::ISODate)
+                    << "current" << current.toString(Qt::ISODate);
+#endif
            weekdayId = current.date().dayOfWeek();
            weekdayIdLast = weekdayId; // TODO: some end condition in json-file

-            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
+            while ((timeRanges = cfg->WeekDaysWorktime.count(weekdayId)) == 0) {
                current = current.addDays(1);
                weekdayId = current.date().dayOfWeek();
                if (weekdayId == weekdayIdLast) {
@@ -538,6 +335,11 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                }
            }

+#if DEBUG==1
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                    << "current" << current.toString(Qt::ISODate);
+#endif
+
            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);

@@ -545,37 +347,56 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
            for (WTIterator itr = p.first; itr != p.second; ++itr) {
                QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);

+#if DEBUG==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.time().toString(Qt::ISODate)
+                            << "t" << t.toString(Qt::ISODate)
+                            << "to" << to.toString(Qt::ISODate);
+#endif
+
                if (to < t) {
                    to = t;
                }
            }

+
            if (current.time() >= to) {
-                if (carryOverNotSet) {
-                    end_datetime = start;
-                    return 0;
-                } else {
                QDateTime const dt = start;
                start = start.addDays(1);
                start.setTime(QTime(0, 0, 0));

                durationMinutesBrutto += dt.secsTo(start) / 60;
                current = start;
-                }
            } else {
+
+#if DEBUG==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
                break;
            }
        }

+#if DEBUG==1
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                    << "timeRanges" << timeRanges << weekdayId
+                    << "durationMinutesBrutto" << durationMinutesBrutto
+                    << "start" << start.toString(Qt::ISODate)
+                    << "current" << current.toString(Qt::ISODate);
+#endif
+
        int durationMinutesNetto = 0;
        uint price = 0;

        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();
+            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);

@@ -587,7 +408,14 @@ double Calculator::GetCostFromDuration(Configuration* cfg,

                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");

+
                    if (current.time() >= to) {
+#if DEBUG==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "from" << from.toString(Qt::ISODate)
+                                    << "to" << to.toString(Qt::ISODate);
+#endif
                        continue; // try to use next available work-time
                    } else
                    if (current.time() <= from) {
@@ -596,6 +424,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                            current.setTime(from); // move current forward (range==1),
                                                   // as prepaid is set
                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+#if DEBUG==1
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                        << "current" << current.toString(Qt::ISODate)
+                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                        << "minutesMoved" << minutesMoved
+                                        << "durationMinutes" << durationMinutes;
+#endif
                            durationMinutesBrutto += minutesMoved;

                            if (range == 1) {
@@ -604,8 +439,15 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                        }
                    }

-                for (auto timeRangeIt = cfg->TimeRange.cbegin(); timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+#if DEBUG==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "from" << from.toString(Qt::ISODate)
+                                << "to" << to.toString(Qt::ISODate)
+                                << "current" << current.toString(Qt::ISODate)
+                                << "durationMinutes" << durationMinutes;
+#endif

+                    while (timeRangeIt != cfg->TimeRange.cend()) {
                        ATBTimeRange timeRange = timeRangeIt->second;

                        timeRange.computeQTimes(current.time());
@@ -613,101 +455,127 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                        int duration = timeRange.time_range_to_in_minutes_from_start -
                                       timeRange.time_range_from_in_minutes_from_start;

-                    qCritical() << __func__ << ":" << __LINE__
+#if DEBUG==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "duration" << duration << timeRange.time_range_id
                                    << "current" << current.toString(Qt::ISODate)
-                                << "duration" << duration
-                                << "minsUsed" << minsUsed
-                                << "minsToCarryOver" << minsToCarryOver;
-
-
-                    //if (minsUsed > 0) {
-                    //    duration -= minsUsed;
-                    //    minsUsed = 0;
-                    //}
+                                    << "minsToCarryOver" <<  minsToCarryOver
+                                    << "durationMinutes" << durationMinutes;
+#endif

                        if (current.addSecs(duration * 60).time() <= to) {
-                        if (minsToCarryOver > 0) {  // the price for this time range
-                                                    // has been is paid already
-                            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;
-
-                                        durationMinutes -= duration;
-                                        durationMinutesNetto += duration;
-                                        durationMinutesBrutto += duration;
-
-                                        current = current.addSecs(duration * 60);
-
-                                        if (durationMinutes <= 0) {
-                                            end_datetime = current;
-                                            return price;
-                                        }
-
-                                        break;
-                                    }
-                                }
-                            } else {
-                                durationMinutes -= duration;
-                                durationMinutesNetto += duration;
-                                durationMinutesBrutto += duration;
-                                current = current.addSecs(duration*60);
+                                    if (minsToCarryOver > 0) {
+                                        durationMinutes -= minsToCarryOver;
+                                        durationMinutesNetto += minsToCarryOver;
+                                        durationMinutesBrutto += minsToCarryOver;
+                                        current = current.addSecs(minsToCarryOver*60);
                                        minsToCarryOver = 0;
-                            }
+#if DEBUG==1
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                    << "durationMinutes" << durationMinutes
+                                                    << "durationMinutesNetto" << durationMinutesNetto
+                                                    << "durationMinutesBrutto" << durationMinutesBrutto
+                                                    << "current" << current.toString(Qt::ISODate);
+#endif
                                    } 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;
                                        durationMinutesNetto += duration;
                                        durationMinutesBrutto += duration;

+#if DEBUG==1
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                    << "duration" << duration
+                                                    << "durationMinutes" << durationMinutes
+                                                    << "durationMinutesNetto" << durationMinutesNetto
+                                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
                                        current = current.addSecs(duration * 60);
-                                    break;
+
+#if DEBUG==1
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                    << "current" << current.toString(Qt::ISODate)
+                                                    << "price" << price;
+#endif
                                    }
+
+                                    break;
                                }
                            }

                            if (durationMinutes <= 0) {
                                end_datetime = current;
+#if DEBUG==1
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                            << "duration" << durationMinutesNetto << ", price" << price
+                                            << current.toString(Qt::ISODate)
+                                            << end_datetime.toString(Qt::ISODate);
+#endif
                                return price;
                            }

-                        //++timeRangeIt;
+                            ++timeRangeIt;

                        } else {

                            lastCurrent = current;
                            current.setTime(to);
-                        minsUsed = lastCurrent.secsTo(current) / 60;
+                            int const minsLeft = lastCurrent.secsTo(current) / 60;

                            // mod duration: possibly discard some minutes in
                            // the next time-range
-                        if (durationMinutes >= minsUsed) {
-                            minsToCarryOver = durationMinutes - minsUsed;
-                        }
+                            minsToCarryOver = (durationMinutes - minsLeft) % duration;

-                        durationMinutes -= minsUsed;
-                        durationMinutesNetto += minsUsed;
-                        durationMinutesBrutto += minsUsed;
+                            durationMinutes -= minsLeft;
+                            durationMinutesNetto += minsLeft;
+                            durationMinutesBrutto += minsLeft;

-                        if (minsUsed > 0) {
+#if DEBUG==1
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                        << "current" << current.toString(Qt::ISODate)
+                                        << "minsLeft" << minsLeft;
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                        << "duration" << duration
+                                        << "durationMinutes" << durationMinutes
+                                        << "durationMinutesNetto" << durationMinutesNetto
+                                        << "durationMinutesBrutto" << durationMinutesBrutto
+                                        << "minsToCarryOver" << minsToCarryOver;
+#endif
+
+                            if (minsLeft > 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 DEBUG==1
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                    << "price" << price;
+#endif
                                        break;
                                    }
                                }
                            }
-                        // break;
+
+                            break;
+                        }
+                    }
                }
-                } // for (WTIterator itr = p.first; itr != p.second; ++itr) {

                end_datetime = start.addSecs(durationMinutesBrutto * 60);
+#if DEBUG==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "duration" << durationMinutesNetto
+                            << ", price" << std::max(price, minParkingPrice)
+                            << start.toString(Qt::ISODate)
+                            << end_datetime.toString(Qt::ISODate);
+#endif
                return std::max(price, minParkingPrice);
            }
        }
@@ -1204,8 +1072,6 @@ 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;
@@ -1213,13 +1079,6 @@ 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";

-        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) {
@@ -1278,7 +1137,6 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
        } else { // if (pop_carry_over) {
            // TODO
        }
-        }
    } else {
        qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";

@@ -1450,18 +1308,6 @@ 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);
        }
    }

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

 #include <QString>
 #include <QDebug>
@@ -32,9 +30,6 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
    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;
-    if (strcmp(member_name, "Interpolation") == 0) return MemberType::InterpolationType;
-    if (strcmp(member_name, "Prepaid") == 0) return MemberType::PrepaidType;
-    if (strcmp(member_name, "CarryOver") == 0) return MemberType::CarryOverType;
    else return MemberType::UnknownType;
 }

@@ -105,9 +100,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
        ATBTimeRange TimeRange;
        ATBTimeStepConfig TimeStepConfig;
        ATBTariffProduct TariffProduct;
-            ATBInterpolation TariffInterpolation;
-            ATBPrepaid TariffPrepaidOption;
-            ATBCarryOver TariffCarryOver;

        MemberType mb_type = MemberType::UnknownType;
        this->currentPaymentOptions.clear();
@@ -148,7 +140,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			if (mb_array.Size() <= 0) break;

 			//Iterate over provided array
-            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++) {
+            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++)
+			{
 				// Get all inner objects, don't print name if NULL
 				auto inner_obj = mb_array[j].GetObject();
 				if (inner_obj.MemberCount() <= 0) break;
@@ -171,184 +164,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					{
 					case MemberType::UnknownType:
 						break;
-                    case MemberType::CarryOverType: {
-                        if (QString(inner_obj_name) == QString("carry_over_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffCarryOver.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("carry_over_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
-                                            QString member(QString::fromStdString(w->name.GetString()));
-                                            if (member == "carry_over_day") {
-                                                if (w->value.IsInt()) {
-                                                    rapidjson::SizeType const d = w->value.GetInt();
-                                                    if (d != (j+1)) {
-                                                        qCritical() << "ERROR: misconfigured jsonfile" << d << "!=" << (j+1);
-                                                    }
-                                                    TariffCarryOver.carryover[day].day = day;
-                                                }
-                                            } else
-                                            if (member == "carry_over_duration") {
-                                                if (w->value.IsInt()) {
-                                                    TariffCarryOver.carryover[day].duration = w->value.GetInt();
-                                                }
-                                            } else
-                                            if (member == "carry_over_seemless") {
-                                                if (w->value.IsBool()) {
-                                                    bool b = w->value.GetBool();
-                                                    TariffCarryOver.carryover[day].seemless = b;
-                                                }
-                                            } else
-                                            if (member == "carry_over_never") {
-                                                if (w->value.IsBool()) {
-                                                    bool b = w->value.GetBool();
-                                                    TariffCarryOver.carryover[day].never = b;
-                                                }
-                                            } else
-                                            if (member == "carry_over_static_start") {
-                                                if (w->value.IsString()) {
-                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
-                                                    TariffCarryOver.carryover[day].static_start = t;
-                                                }
-                                            } else
-                                            if (member == "carry_over_static_end") {
-                                                if (w->value.IsString()) {
-                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
-                                                    TariffCarryOver.carryover[day].static_end = t;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } break;
-                    case MemberType::PrepaidType: {
-                        if (QString(inner_obj_name) == QString("prepaid_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffPrepaidOption.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_anytime")) {
-                            if (k->value.IsBool()) {
-                                bool const &x = k->value.GetBool();
-                                TariffPrepaidOption.anytime = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_never")) {
-                            if (k->value.IsBool()) {
-                                bool const &x = k->value.GetBool();
-                                TariffPrepaidOption.never = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_static_start")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffPrepaidOption.static_start = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_static_end")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffPrepaidOption.static_end = t;
-                            }
-                        }
-                    } break;
-                    case MemberType::InterpolationType: {
-                        if (QString(inner_obj_name) == QString("interpol_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffInterpolation.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_start")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.static_start = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_end")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.static_end = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_start_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.static_start_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_end_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.static_end_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_duration")) {
-                            if (k->value.IsInt()) {
-                                int const x = k->value.GetInt();
-                                TariffInterpolation.static_duration = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_start")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.dynamic_start = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_end")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.dynamic_end = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_start_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.dynamic_start_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_end_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.dynamic_end_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_duration")) {
-                            if (k->value.IsInt()) {
-                                int const x = k->value.GetInt();
-                                TariffInterpolation.dynamic_duration = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_until_price")) {
-                            if (k->value.IsInt()) {
-                                int const x = k->value.GetInt();
-                                TariffInterpolation.dynamic_until_price = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_seemless")) {
-                            if (k->value.IsBool()) {
-                                bool const x = k->value.GetBool();
-                                TariffInterpolation.seemless = x;
-                            }
-                        }
-                        if (QString(inner_obj_name) == QString("interpol_never")) {
-                            if (k->value.IsBool()) {
-                                bool const x = k->value.GetBool();
-                                TariffInterpolation.never = x;
-                            }
-                        }
-                    } break;
                    case MemberType::ProductType: {
                        if (QString(inner_obj_name) == QString("tariff_product_id")) {
                            if (k->value.IsInt()) {
@@ -582,30 +397,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                            this->currentPaymentOptions.last().pop_id = k->value.GetInt();
                        } else if (strcmp(inner_obj_name, "pop_label") == 0) {
                            this->currentPaymentOptions.last().pop_label = k->value.GetString();
-                        } else if (strcmp(inner_obj_name, "pop_product_id") == 0) {
-                            this->currentPaymentOptions.last().pop_product_id = k->value.GetInt();
-                        } else if (strcmp(inner_obj_name, "pop_product_name") == 0) {
-                            if (k->value.IsString()) {
-                                QString const &s = QString::fromStdString(k->value.GetString());
-                                this->currentPaymentOptions.last().pop_product_name = s;
-                            }
-                        } else if (strcmp(inner_obj_name, "pop_use_only_upto_datetime") == 0) {
-                            if (k->value.IsString()) {
-                                QString const &s = QString::fromStdString(k->value.GetString());
-                                this->currentPaymentOptions.last().pop_use_only_upto_datetime = s;
-                            }
-                        } else if (strcmp(inner_obj_name, "pop_use_only_for_duration") == 0) {
-                            if (k->value.IsInt()) {
-                                this->currentPaymentOptions.last().pop_use_only_for_duration = k->value.GetInt();
-                            }
-                        } else if (strcmp(inner_obj_name, "pop_plus_steps") == 0) {
-                            if (k->value.IsInt()) {
-                                this->currentPaymentOptions.last().pop_plus_steps = k->value.GetInt();
-                            }
-                        } else if (strcmp(inner_obj_name, "pop_minus_steps") == 0) {
-                            if (k->value.IsInt()) {
-                                this->currentPaymentOptions.last().pop_minus_steps = k->value.GetInt();
-                            }
                        } else if (strcmp(inner_obj_name, "pop_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) {
@@ -622,16 +413,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                            this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
                        } else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
                            this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
-                        } else if (strcmp(inner_obj_name, "pop_prepaid_option_id") == 0) {
-                            this->currentPaymentOptions.last().pop_prepaid_option_id = k->value.GetInt();
-                        } else if (strcmp(inner_obj_name, "pop_truncate_last_interpolation_step") == 0) {
-                            this->currentPaymentOptions.last().pop_truncate_last_interpolation_step = k->value.GetBool();
-                        } else if (strcmp(inner_obj_name, "pop_accumulate_prices") == 0) {
-                            this->currentPaymentOptions.last().pop_accumulate_prices = k->value.GetBool();
-                        } else if (strcmp(inner_obj_name, "pop_accumulate_durations") == 0) {
-                            this->currentPaymentOptions.last().pop_accumulate_durations = k->value.GetBool();
-                        } else if (strcmp(inner_obj_name, "pop_carry_over_option_id") == 0) {
-                            this->currentPaymentOptions.last().pop_carry_over_option_id = k->value.GetInt();
                        } else if (strcmp(inner_obj_name, "pop_carry_over") == 0) {
                            this->currentPaymentOptions.last().pop_carry_over = k->value.GetInt();
                        } else if (strcmp(inner_obj_name, "pop_carry_over_time_range_id") == 0) {
@@ -715,12 +496,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pun_duration") == 0) {
-                            Duration.pun_duration = k->value.GetDouble();
-                            Duration.pun_duration_saved = Duration.pun_duration;
-                        } else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pun_duration") == 0) Duration.pun_duration = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
                        else if (strcmp(inner_obj_name, "pun_duration_max") == 0) Duration.pun_duration_max = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pun_interpolation_id") == 0) Duration.pun_interpolation_id = k->value.GetInt();
                        break;
 					case MemberType::SpecialDaysWorktimeType:
 						if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
@@ -736,8 +514,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						break;*/
 					case MemberType::WeekDaysWorkTimeType:
 						if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
-                        if (strcmp(inner_obj_name, "pwd_pop_id") == 0) WeekDaysWorktime.pwd_pop_id = k->value.GetInt();
-                        if (strcmp(inner_obj_name, "pwd_next_id") == 0) WeekDaysWorktime.pwd_next_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
@@ -767,14 +543,15 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 				}

 				// Push to specific list depending on member type
-                switch (mb_type) {
+				switch (mb_type)
+				{
 				case MemberType::UnknownType:
 					break;
 				case MemberType::PaymentMethodType:
 					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
 					break;
                case MemberType::PaymentRateType:
-                    // qCritical() << "PaymentRate" << PaymentRate.pra_price << PaymentRate.pra_payment_option_id;
+                    // qCritical() << "PaymentRate" << PaymentRate;
                    cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
 					break;
                case MemberType::PaymentOptionType: {
@@ -785,7 +562,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                } break;
 				case MemberType::DurationType:
 					cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
-                    // qCritical() << Duration;
 					break;
 				case MemberType::SpecialDaysWorktimeType:
 					cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
@@ -804,16 +580,16 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					break;
                case MemberType::DailyTicketType:
                    cfg->DailyTicket.insert(pair<int, ATBDailyTicket>(DailyTicket.daily_ticket_id, DailyTicket));
-                    // qCritical() << DailyTicket;
+                    qCritical() << DailyTicket;
                    DailyTicket.reset();
                    break;
                case MemberType::CustomerType:
                    cfg->Customer.insert(pair<int, ATBCustomer>(Customer.cust_id, Customer));
-                    // qCritical() << Customer;
+                    qCritical() << Customer;
                    break;
                case MemberType::TimeBaseType:
                    cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
-                    // qCritical() << TimeBase;
+                    qCritical() << TimeBase;
                    break;
                case MemberType::TimeRangeType:
                    cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
@@ -825,20 +601,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                    break;
                case MemberType::ProductType:
                    cfg->TariffProduct.insert(pair<int, ATBTariffProduct>(TariffProduct.m_tariff_product_id, TariffProduct));
-                    // qCritical() << TariffProduct;
-                    break;
-                case MemberType::InterpolationType:
-                    cfg->TariffInterpolations.insert(pair<int, ATBInterpolation>(TariffInterpolation.id, TariffInterpolation));
-                    // qCritical() << TariffInterpolation;
-                    break;
-                case MemberType::PrepaidType:
-                    cfg->TariffPrepaidOptions.insert(pair<int, ATBPrepaid>(TariffPrepaidOption.id, TariffPrepaidOption));
-                    // qCritical() << TariffPrepaidOption;
-                    break;
-                case MemberType::CarryOverType:
-                    cfg->TariffCarryOverOptions.insert(pair<int, ATBCarryOver>(TariffCarryOver.id, TariffCarryOver));
-                    // qCritical() << TariffCarryOver;
-                    break;
+                    qCritical() << TariffProduct;
                default:
 					break;
 				}
@@ -852,125 +615,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 	}
 }

-std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const {
-    int const pop_id = getPaymentOptions(paymentOptionIndex).pop_id;
-    int const pop_carry_over_option_id = getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-    int const pop_truncate_last_interpolation_step = getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
-    int const weekDay = start.date().dayOfWeek();
-    //QTime const &carryOverStart = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-    //QTime const &carryOverEnd = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
-    //bool const carry_over_seemless = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].seemless;
-    //bool const carry_over_never = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].never;
-    int const carryOverDuration  = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
-
-    std::optional<QDateTime> value = std::nullopt;
-
-    QDateTime interpolationEndTime = start;
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ")        computed interpol end:" << interpolationEndTime.toString(Qt::ISODate);
-
-    int price = 0;
-
-    for (auto[itr, rangeEnd] = PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-        int const durationId = itr->second.pra_payment_unit_id;
-        // int const price = itr->second.pra_price;
-
-        auto search = Duration.find(durationId);
-        if (search != Duration.end()) {
-            ATBDuration duration = search->second;
-
-            if (duration.pun_interpolation_id == -1) {
-                // should never happen -> misconfigured tariff-file
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ") ERROR pun_interpolation not set!";
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ") See for instance customer_505/6";
-                break;
-            }
-
-            std::optional<ATBInterpolation> ipolCheck = getInterpolationType(duration.pun_interpolation_id);
-            if (ipolCheck) {
-                ATBInterpolation interpolation = ipolCheck.value();
-                switch (duration.pun_interpolation_id) {
-                    case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
-                    break;
-                    case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::STATIC_TIMEPOINT_AND_DURATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE): {
-                        interpolation.dynamic_start = start.time();
-                        interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
-
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")               interpol start:" << interpolation.dynamic_start.toString(Qt::ISODate);
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << interpolationEndTime.toString(Qt::ISODate);
-
-                        if (interpolation.seemless) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                        } else
-                        if (interpolation.never) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                        } else {
-                            QDateTime const &s = interpolationEndTime.addSecs(duration.pun_duration * 60);
-                            int const minutesToStaticEnd = s.time().secsTo(interpolation.static_end) / 60;
-
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << s.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")          interpol static end:" << interpolation.static_end.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")        minutes to static end:" << minutesToStaticEnd;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                       pun-id:" << duration.pun_id;
-
-                            int p = 0;
-                            for (auto[it, rangeEnd] = this->PaymentRate.equal_range(pop_id); it != rangeEnd; ++it) {
-                                if (it->second.pra_payment_unit_id == duration.pun_id) {
-                                    if (minutesToStaticEnd >= 0) {
-                                        // the end of the interpolation for this day must be before a possible carry over interval
-                                        p = it->second.pra_price;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   next price:" << p;
-                                        price += p;
-                                        interpolationEndTime = s;
-                                    } else {
-                                        if (pop_truncate_last_interpolation_step == false) {
-                                            p = it->second.pra_price;
-                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   next price:" << p;
-                                            price += p;
-                                            interpolationEndTime = s;
-                                            interpolationEndTime = interpolationEndTime.addSecs(carryOverDuration * 60);
-                                        } else {
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                                        }
-                                    }
-                                }
-                            }
-
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                        price:" << price;
-
-                            if (price >= interpolation.dynamic_until_price) {
-     //                           qCritical() << "(" << __func__ << ":" << __LINE__ << ")                        price:" << price;
-     //                           qCritical() << "(" << __func__ << ":" << __LINE__ << ")        computed interpol end:" << interpolationEndTime.toString(Qt::ISODate);
-                                value = value.value_or(interpolationEndTime);
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
-                    break;
-                    default:;
-                }
-            }
-        }
-    }
-
-    return value;
-}
-
-
 int Configuration::getPaymentOptionIndexIfSpecialDay(QDateTime const &dt) const {
    if (isSpecialDay(dt)) {
        int const numOptions = getAllPaymentOptions().size();
@@ -995,9 +639,6 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
            for (int opt=0; opt < numOptions; ++opt) {
                uint64_t const pop_id = getPaymentOptions(opt).pop_id;
                if (pop_id == (uint64_t)sd.ped_payment_option_id) {
-
-                    qCritical() << __func__ << __LINE__ << opt;
-
                    return opt;
                }
            }
@@ -1007,9 +648,6 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
    for (int opt=0; opt < numOptions; ++opt) {
        uint64_t const pop_business_hours = getPaymentOptions(opt).pop_business_hours;

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

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

        if ((pop_business_hours & p) == p) {
-
-            qCritical() << __func__ << __LINE__ << opt;
-
            return opt;
        }
    }
@@ -1159,41 +794,6 @@ Configuration::getTariffProductForProductTypeName(QString const &permitTypeName)
    return value;
 }

-int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
-
-    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
-    if (paymentOptions) {
-        QVector<ATBPaymentOption> const vec = paymentOptions.value();
-        PermitType const p(permitType);
-
-        for (int i = 0; i < vec.size(); ++i) {
-            if (vec[i].pop_product_name == p.toString()) {
-               return i;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
-    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
-    if (paymentOptions) {
-
-
-        QVector<ATBPaymentOption> const vec = paymentOptions.value();
-        PermitType const p(permitType);
-
-        for (int i = 0; i < vec.size(); ++i) {
-            if (vec[i].pop_product_name == p.toString()) {
-               return i;
-            }
-        }
-    }
-
-    return 0;
-}
-
 std::optional<QVector<ATBTariffProduct>>
 Configuration::getTariffProductForProductId(PermitType permitType) const {
    QString permitTypeName(permitType);
@@ -1240,51 +840,6 @@ Configuration::getDailyTicketsForAllKeys() const {
    return value;
 }

-std::optional<ATBInterpolation> Configuration::getInterpolationType(int key) const {
-    std::optional<ATBInterpolation> value;
-    for (auto[it, rangeEnd] = this->TariffInterpolations.equal_range(key); it != rangeEnd; ++it) {
-        value = value.value_or(it->second);
-    }
-    return value;
-}
-
-std::optional<ATBPrepaid> Configuration::getPrepaidType(int key) const {
-    std::optional<ATBPrepaid> value;
-    for (auto[it, rangeEnd] = this->TariffPrepaidOptions.equal_range(key); it != rangeEnd; ++it) {
-        value = value.value_or(it->second);
-    }
-    return value;
-}
-
-std::optional<QDateTime> Configuration::prepaidStart(QDateTime const &start, int prepaid_option_id) {
-    std::optional<QDateTime> value;
-    QDateTime s = start;
-
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid option id:" << prepaid_option_id;
-
-    std::optional<ATBPrepaid> prepaid_option = getPrepaidType(prepaid_option_id);
-    if (prepaid_option.has_value()) {
-        ATBPrepaid prepaid = prepaid_option.value();
-
-        if (prepaid.never == false) {
-            // start: 22:00, end: 08:00
-            QTime prepaidStart = TariffPrepaidOptions.find(prepaid_option_id)->second.static_start;
-            QTime prepaidEnd = TariffPrepaidOptions.find(prepaid_option_id)->second.static_end;
-
-            if (s.time() >= prepaidStart) {
-                s = s.addDays(1);
-                s.setTime(prepaidEnd);
-            } else
-            if (s.time() < prepaidEnd) {
-                s.setTime(prepaidEnd);
-            }
-            s.setTime(QTime(s.time().hour(), s.time().minute(), 0));
-            value = value.value_or(s);
-        }
-    }
-    return value;
-}
-
 std::optional<QVector<ATBDailyTicket>>
 Configuration::getDailyTicketsForKey(int key) const {
    QVector<ATBDailyTicket> tickets;
@@ -1303,65 +858,6 @@ Configuration::getDailyTicketsForKey(int key) const {
    return value;
 }

-std::optional<ATBPaymentOption>
-Configuration::getPaymentOptionForId(int key) const {
-    ATBPaymentOption option;
-    std::optional<ATBPaymentOption> value;
-
-    for (auto[it, rangeEnd] = this->PaymentOption.equal_range(key); it != rangeEnd; ++it) {
-        value = value.value_or(it->second);
-    }
-
-    return value;
-}
-
-std::optional<QVector<ATBPaymentOption>>
-Configuration::getPaymentOptionsForAllKeys() const {
-    QVector<ATBPaymentOption> paymentOptions;
-    std::optional<QVector<ATBPaymentOption>> value;
-    for (std::multimap<int, ATBPaymentOption>::const_iterator it = this->PaymentOption.cbegin();
-        it != this->PaymentOption.cend(); ++it) {
-        paymentOptions.append(it->second);
-    }
-
-    if (paymentOptions.size() > 0) {
-        value = value.value_or(paymentOptions);
-    }
-
-    return value;
-}
-
-// TODO: umbenennen: getPaymentOptionForPermitType
-std::optional<ATBPaymentOption>
-Configuration::getPaymentOptionForKey(PERMIT_TYPE permitType) const {
-    return getPaymentOptionForKey(static_cast<int>(permitType));
-}
-
-
-// TODO: umbenennen: getPaymentOptionForPermitType
-std::optional<ATBPaymentOption>
-Configuration::getPaymentOptionForKey(int permitType) const {
-    std::optional<ATBPaymentOption> value;
-
-    for (std::multimap<int, ATBPaymentOption>::const_iterator it = this->PaymentOption.cbegin();
-        it != this->PaymentOption.cend(); ++it) {
-        ATBPaymentOption const &paymentOption = it->second;
-        if (paymentOption.pop_product_id == permitType) {
-            value = value.value_or(paymentOption);
-            break;
-        }
-    }
-
-    return value;
-}
-
-// TODO: umbenennen: getPaymentOptionForPermitType
-std::optional<ATBPaymentOption>
-Configuration::getPaymentOptionForKey(QString const &permitTypeStr) const {
-    PERMIT_TYPE permitType = PermitType::toPermitType(permitTypeStr);
-    return getPaymentOptionForKey(static_cast<int>(permitType));
-}
-
 std::optional<QVector<ATBPaymentRate>>
 Configuration::getPaymentRateForAllKeys() const {
    QVector<ATBPaymentRate> paymentRates;
@@ -1411,25 +907,6 @@ Configuration::getCustomerForType(ATBCustomer::CustomerType customerType) {
    return std::nullopt;
 }

-std::optional<QVector<ATBWeekDaysWorktime>>
-Configuration::getAllWeekDayWorkTimes() {
-    QVector<ATBWeekDaysWorktime> worktimes;
-    std::optional<QVector<ATBWeekDaysWorktime>> value;
-
-    worktimes.clear();
-
-    for (std::multimap<int, ATBWeekDaysWorktime>::const_iterator it = this->WeekDaysWorktime.cbegin();
-        it != this->WeekDaysWorktime.cend(); ++it) {
-        worktimes.append(it->second);
-    }
-
-    if (worktimes.size() > 0) {
-        value = value.value_or(worktimes);
-    }
-
-    return value;
-}
-
 std::optional<ATBWeekDaysWorktime>
 Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
    ATBWeekDaysWorktime worktime;
--- a/library/src/tariff_global_defines.cpp
+++ b/library/src/tariff_global_defines.cpp
@@ -1,5 +0,0 @@
-#include "tariff_global_defines.h"
-
-int DBG_LEVEL = DBG_NOTICE;
-// int DBG_LEVEL = DBG_INFORMATION;
-// int DBG_LEVEL = DBG_DEBUG;
--- a/library/src/utilities.cpp
+++ b/library/src/utilities.cpp
@@ -215,43 +215,6 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
    return true;
 }

-std::optional<ATBPeriodYear>
-Utilities::GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime) {
-
-    ATBPeriodYear period;
-    std::optional<ATBPeriodYear> value;
-
-    for (multimap<int, ATBPeriodYear>::const_iterator it = cfg->YearPeriod.cbegin();
-         it != cfg->YearPeriod.cend();
-         ++it) {
-        QDate const s(currentDateTime.date().year(), it->second.pye_start_month, it->second.pye_start_day);
-        QDate const e(currentDateTime.date().year(), it->second.pye_end_month, it->second.pye_end_day);
-
-        QDateTime start(currentDateTime);
-        QDateTime end(currentDateTime);
-
-        start.setDate(s);
-        end.setDate(e);
-
-        if (start.date().dayOfYear() < end.date().dayOfYear()) {
-            // start and end in the same year
-            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() &&
-                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
-                value = value.value_or(it->second);
-                break;
-            }
-        } else {
-            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() ||
-                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
-                value = value.value_or(it->second);
-                break;
-            }
-        }
-    }
-
-    return value;
-}
-
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {
--- a/main/cc_iuc_asynchpos.h
+++ b/main/cc_iuc_asynchpos.h
@@ -0,0 +1,113 @@
+#ifndef CC_IUC_ASYNCHPOS_H
+#define CC_IUC_ASYNCHPOS_H
+
+/*
+ * cc_iuc_asynchpos.c
+ *
+ * Created: 21.11.2017
+ *  Author: Matthias
+ */
+
+#include <cstdlib>
+#include <cinttypes>
+
+//#define IUC_ASYCHNPOS_TESTMODE 1
+
+#define IUC_ASYNCHPOS_COINCOIDE_H               0x09
+#define IUC_ASYNCHPOS_COINCOIDE_L               0x78
+#define IUC_ASYNCHPOS_MAX_ARRAY_SIZE	        1024
+#define IUC_ASYNCHPOS_MAX_TX_MESSAGE_SIZE	    300
+#define IUC_ASYNCHPOS_MAX_RX_MESSAGE_SIZE	    10000   // 17000
+#define IUC_ASYNCHPOS_MIN_PACKET_SIZE	        16
+#define IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE        32
+#define IUC_ASYNCHPOS_MIN_BASE_BYTE_DATA_SIZE   16
+#define IUC_ASYNCHPOS_POLYNOME	                0xedb88320	// 0x04C11DB7
+#define IUC_ASYNCHPOS_POLYNOME_INITIAL	        0		    // 0xFFFFFFFF
+#define IUC_ASYNCHPOS_PRINTTIMOUT               1000
+//#define IUC_ASYNCHPOS_RECEIPT_LENGTH 16384
+
+#define STX     0x01
+#define ETX1    0x02
+#define ETX2    0x03
+#define EOT     0x04
+#define ENQ     0x05
+#define ACK1    0x06
+#define ACK2    0x07
+#define DLE     0x10
+#define NAK     0x15
+
+unsigned static char terminalID[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+unsigned static char terminalAPAK[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+unsigned static char rxAsynchData[IUC_ASYNCHPOS_MAX_RX_MESSAGE_SIZE];
+unsigned static char terminalSignature[16];
+//unsigned static char messageData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE];
+unsigned static char receiptData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1];
+unsigned static char txAsynchData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE];
+unsigned static char ENQrecieved;
+unsigned static int rxCounter;
+unsigned static int messageLength;
+unsigned static long timeInitalized;
+unsigned static long timeHoldISMAS;
+unsigned static long crcTable[256];
+unsigned static char tableCreated;
+unsigned static int asynchState;
+unsigned static char asynchSessionClosed;
+unsigned static char iuc_asynch_PRNrecieved;
+unsigned static char iuc_asynch_keepAlive;
+unsigned static char iuc_asynch_PrintControl;
+unsigned static char iuc_asynchpos_crc_old;
+unsigned static int iuc_print_counter;
+unsigned static int iuc_asynch_printTimeout;
+unsigned static char iucAsynchpoxDataContext;
+//Prozessdaten - highly private
+struct billAsynchData {
+	unsigned char time[20]; //UCHAR tagValue[] = "2017-12-19 13:40:00";
+	unsigned char id[37];
+	unsigned char printId[129];
+	unsigned char docNr[33];
+	//unsigned char amount[10];
+	//unsigned char token[25];
+	//unsigned char result[8];
+	//unsigned char authCode[7];
+	//unsigned char rrn[13];
+	//unsigned char stan[7];
+	//unsigned char cardtype[33];
+	unsigned char errCode[17];
+	//unsigned char receiptData[IUC_ASYNCHPOS_RECEIPT_LENGTH];
+};
+
+//private
+unsigned int iuc_asynchpos_send(unsigned char packetType, unsigned char* pData, unsigned int length, unsigned char needRTS);
+
+//void iuc_asynchpos_interpretCommand(unsigned int readLength_);
+
+//public
+void iuc_asynchpos_setTerminalID(unsigned char *pID, unsigned int length);
+void iuc_asynchpos_setTerminalAPAK(unsigned char *pAPAK, unsigned int length);
+unsigned char iuc_asynchpos_recieve_serial(unsigned char waitforACK);
+void iuc_asynchpos_init();
+void iuc_asynchpos_handleCommand(unsigned char command, unsigned char status);
+int iuc_asynchpos_checkTime();
+unsigned char iuc_asynchpos_getIsSaleRunning();
+
+//commands
+void iuc_asynchpos_command_ping_terminal(void);
+void iuc_asynchpos_command_Login();
+void iuc_asynchpos_command_Logout();
+void iuc_asynchpos_command_authorize(unsigned int vkPreis);
+void iuc_asynchpos_command_cancel_authorize();
+void iuc_asynchpos_command_close_Document(unsigned char isStorno);
+void iuc_asynchpos_command_print_Result(unsigned char status);
+
+//void iuc_asynchpos_handleCommand(unsigned char command, unsigned char status);
+//void iuc_asynchpos_init();
+//int iuc_asynchpos_checkTime();
+
+//unsigned char iuc_asynchpos_getCurrentStatus();
+
+//int iuc_asynchpos_heartbeat();
+
+
+uint32_t iuc_asynchpos_sub_updateCRC(uint32_t crc, char* pData, size_t len);
+
+#endif
--- a/main/main.cpp
+++ b/main/main.cpp
--- a/main/main.pro
+++ b/main/main.pro
@@ -25,14 +25,19 @@ CONFIG(debug, debug|release) {
    }
 }

-SOURCES += main.cpp
+SOURCES += main.cpp \
+    aes128.cpp \
+    cc_iuc_asynchpos.cpp \
+    terminal_utils.cpp \
+    MessageHelper.cpp

-# HEADERS +=
+HEADERS += aes128.h \
+    cc_iuc_asynchpos.h \
+    terminal_utils.h \
+    MessageHelper.h
+
+# OTHER_FILES += \

-OTHER_FILES += \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json
Author	SHA1	Message	Date
Gerhard Hoffmann	861a405ec0	tests for galtuer	2024-07-13 13:57:32 +02:00
Gerhard Hoffmann	6b88213644	GetTimeSteps(): return step-list as reference; return only a non-empty step-list.	2024-07-13 13:57:07 +02:00
Gerhard Hoffmann	dda04434fc	Allow some tolerance when looking for a match for the first time-step	2024-07-13 13:55:24 +02:00
Gerhard Hoffmann	a7f3477752	GetTimeSteps(): changed return type, so comoute_next_timestep() can change the first element of step-list	2024-07-13 13:53:53 +02:00
Gerhard Hoffmann	8367eb9fa8	add files for fix	2024-07-05 12:02:27 +02:00