Removed some debug output for testing

Use special flag 'pop_accumulate_prices' to add up prices given in the
tariff json file.

library/include/mobilisis/calculate_price.h

@@ -42,18 +42,34 @@ struct CALCULATE_LIBRARY_API price_t {
 };
 
 struct CALCULATE_LIBRARY_API CalcState {
+    static QString const SUCCESS;
+    static QString const ERROR_PARSING_ZONE_NR;
+    static QString const ERROR_LOADING_TARIFF;
+    static QString const ERROR_PARSING_TARIFF;
+    static QString const NEGATIVE_PARKING_TIME;
+    static QString const INVALID_START_DATE;
+    static QString const WRONG_PARAM_VALUES;
+    static QString const WRONG_ISO_TIME_FORMAT;
+    static QString const ABOVE_MAX_PARKING_TIME;
+    static QString const BELOW_MIN_PARKING_TIME;
+    static QString const BELOW_MIN_PARKING_PRICE;
+    static QString const ABOVE_MAX_PARKING_PRICE;
+    static QString const OVERPAID;
+    static QString const OUTSIDE_ALLOWED_PARKING_TIME;
+
     enum class State : uint8_t {
         SUCCESS,
         ERROR_PARSING_ZONE_NR,
         ERROR_LOADING_TARIFF,
         ERROR_PARSING_TARIFF,
-        NEGATIVE_PARING_TIME,
+        NEGATIVE_PARKING_TIME,
         INVALID_START_DATE,
         WRONG_PARAM_VALUES,
         WRONG_ISO_TIME_FORMAT,
         ABOVE_MAX_PARKING_TIME,
         BELOW_MIN_PARKING_TIME,
         BELOW_MIN_PARKING_PRICE,
+        ABOVE_MAX_PARKING_PRICE,
         OVERPAID,
         OUTSIDE_ALLOWED_PARKING_TIME
     };
@@ -88,96 +104,153 @@ struct CALCULATE_LIBRARY_API CalcState {
         QString s;
         switch (m_status) {
         case State::SUCCESS:
-            s = "SUCCESS";
+            s = CalcState::SUCCESS;
             break;
         case State::ERROR_PARSING_ZONE_NR:
-            s = "ERROR_PARSING_ZONE_NR";
+            s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
         case State::ERROR_LOADING_TARIFF:
-            s = "ERROR_LOADING_TARIFF";
+            s = CalcState::ERROR_LOADING_TARIFF;
             break;
         case State::ERROR_PARSING_TARIFF:
-            s = "ERROR_PARSING_TARIFF";
+            s = CalcState::ERROR_PARSING_TARIFF;
             break;
-        case State::NEGATIVE_PARING_TIME:
-            s = "NEGATIVE_PARKING_TIME";
+        case State::NEGATIVE_PARKING_TIME:
+            s = CalcState::NEGATIVE_PARKING_TIME;
            break;
         case State::ABOVE_MAX_PARKING_TIME:
-            s = "ABOVE_MAX_PARKING_TIME";
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
             break;
         case State::WRONG_PARAM_VALUES:
-            s = "WRONG_PARAM_VALUES";
+            s = CalcState::WRONG_PARAM_VALUES;
             break;
         case State::BELOW_MIN_PARKING_TIME:
-            s = "BELOW_MIN_PARKING_TIME";
+            s = CalcState::BELOW_MIN_PARKING_TIME;
             break;
         case State::BELOW_MIN_PARKING_PRICE:
-            s = "BELOW_MIN_PARKING_PRICE";
+            s = CalcState::BELOW_MIN_PARKING_PRICE;
             break;
         case State::OVERPAID:
-            s = "OVERPAID";
+            s = CalcState::OVERPAID;
             break;
         case State::INVALID_START_DATE:
-            s = "INVALID_START_DATE";
+            s = CalcState::INVALID_START_DATE;
             break;
         case State::WRONG_ISO_TIME_FORMAT:
-            s = "WRONG_ISO_TIME_FORMAT";
+            s = CalcState::WRONG_ISO_TIME_FORMAT;
             break;
         case State::OUTSIDE_ALLOWED_PARKING_TIME:
-            s = "OUTSIDE_ALLOWED_PARKING_TIME";
+            s = CalcState::OUTSIDE_ALLOWED_PARKING_TIME;
+            break;
+        case State::ABOVE_MAX_PARKING_PRICE:
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
+            break;
         }
-        return s + ":" + m_desc;
+        if (m_desc.size() > 0) {
+            return s + ":" + m_desc;
+        }
+        return s;
     }
 
     explicit operator QString () const noexcept {
         QString s;
         switch (m_status) {
         case State::SUCCESS:
-            s = "SUCCESS";
+            s = CalcState::SUCCESS;
             break;
         case State::ERROR_PARSING_ZONE_NR:
-            s = "ERROR_PARSING_ZONE_NR";
+            s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
         case State::ERROR_LOADING_TARIFF:
-            s = "ERROR_LOADING_TARIFF";
+            s = CalcState::ERROR_LOADING_TARIFF;
             break;
         case State::ERROR_PARSING_TARIFF:
-            s = "ERROR_PARSING_TARIFF";
+            s = CalcState::ERROR_PARSING_TARIFF;
             break;
-        case State::NEGATIVE_PARING_TIME:
-            s = "NEGATIVE_PARKING_TIME";
+        case State::NEGATIVE_PARKING_TIME:
+            s = CalcState::NEGATIVE_PARKING_TIME;
            break;
         case State::ABOVE_MAX_PARKING_TIME:
-            s = "ABOVE_MAX_PARKING_TIME";
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
             break;
         case State::WRONG_PARAM_VALUES:
-            s = "WRONG_PARAM_VALUES";
+            s = CalcState::WRONG_PARAM_VALUES;
             break;
         case State::BELOW_MIN_PARKING_TIME:
-            s = "BELOW_MIN_PARKING_TIME";
+            s = CalcState::BELOW_MIN_PARKING_TIME;
             break;
         case State::BELOW_MIN_PARKING_PRICE:
-            s = "BELOW_MIN_PARKING_PRICE";
+            s = CalcState::BELOW_MIN_PARKING_PRICE;
             break;
         case State::OVERPAID:
-            s = "OVERPAID";
+            s = CalcState::OVERPAID;
             break;
         case State::INVALID_START_DATE:
-            s = "INVALID_START_DATE";
+            s = CalcState::INVALID_START_DATE;
             break;
         case State::WRONG_ISO_TIME_FORMAT:
-            s = "WRONG_ISO_TIME_FORMAT";
+            s = CalcState::WRONG_ISO_TIME_FORMAT;
             break;
         case State::OUTSIDE_ALLOWED_PARKING_TIME:
-            s = "OUTSIDE_ALLOWED_PARKING_TIME";
+            s = CalcState::OUTSIDE_ALLOWED_PARKING_TIME;
+            break;
+        case State::ABOVE_MAX_PARKING_PRICE:
+            s = CalcState::ABOVE_MAX_PARKING_TIME;
+            break;
         }
         return s + ":" + m_desc;
     }
 
     CalcState &set(State s) { m_status = s; return *this; }
     CalcState &setStatus(State s) { return set(s); }
+    CalcState &setStatus(QString const &desc) {
+        if (desc == SUCCESS) {
+            m_status = State::SUCCESS;
+        } else
+        if (desc == ERROR_PARSING_ZONE_NR) {
+            m_status = State::ERROR_PARSING_ZONE_NR;
+        } else
+        if (desc == ERROR_LOADING_TARIFF) {
+            m_status = State::SUCCESS;
+        } else
+        if (desc == ERROR_PARSING_TARIFF) {
+            m_status = State::ERROR_LOADING_TARIFF;
+        } else
+        if (desc == NEGATIVE_PARKING_TIME) {
+            m_status = State::NEGATIVE_PARKING_TIME;
+        } else
+        if (desc == INVALID_START_DATE) {
+            m_status = State::INVALID_START_DATE;
+        } else
+        if (desc == WRONG_PARAM_VALUES) {
+            m_status = State::WRONG_PARAM_VALUES;
+        } else
+        if (desc == WRONG_ISO_TIME_FORMAT) {
+            m_status = State::WRONG_ISO_TIME_FORMAT;
+        } else
+        if (desc == ABOVE_MAX_PARKING_TIME) {
+            m_status = State::ABOVE_MAX_PARKING_TIME;
+        } else
+        if (desc == BELOW_MIN_PARKING_TIME) {
+            m_status = State::BELOW_MIN_PARKING_TIME;
+        } else
+        if (desc == BELOW_MIN_PARKING_PRICE) {
+            m_status = State::BELOW_MIN_PARKING_PRICE;
+        } else
+        if (desc == OVERPAID) {
+            m_status = State::OVERPAID;
+        } else
+        if (desc == OUTSIDE_ALLOWED_PARKING_TIME) {
+            m_status = State::OUTSIDE_ALLOWED_PARKING_TIME;
+        } else
+        if (desc == ABOVE_MAX_PARKING_PRICE) {
+            m_status = State::ABOVE_MAX_PARKING_PRICE;
+        }
+
+        return *this;
+    }
     State getStatus() const { return m_status; }
-    CalcState &setDesc(QString s) { m_desc = s; return *this; }
+    CalcState &setDesc(QString const &s) { m_desc = s; return *this; }
 
     void setAllowedTimeRange(QTime const &from, QTime const &until) {
         m_allowedTimeRange.setTimeRange(from, until);

library/include/mobilisis/calculator_functions.h

@@ -91,8 +91,10 @@ 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) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
+    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> GetPriceSteps(Configuration *cfg) const;
 

library/include/mobilisis/configuration.h

@@ -25,6 +25,9 @@
 #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 <QVector>
 #include <optional>
@@ -41,26 +44,32 @@ 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>;
 
     ATBProject project;
     ATBCurrency Currency;
-	ATBDuration duration;
+    ATBDuration duration;
 
 	multimap<int, ATBDuration> Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
-    SpecialDaysWorktimeType SpecialDaysWorktime;
-    SpecialDaysType SpecialDays;
+	SpecialDaysWorktimeType SpecialDaysWorktime;
+	SpecialDaysType SpecialDays;
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-    ATBPaymentOptionType PaymentOption;
-    multimap<int, ATBDailyTicket> DailyTicket;
-    TimeRangeType TimeRange;
-    multimap<int, ATBTimeStepConfig> TimeStepConfig;
-    multimap<int, ATBTimeBase> TimeBase;
-    multimap<int, ATBCustomer> Customer;
-    TariffProductType TariffProduct;
+	ATBPaymentOptionType PaymentOption;
+	multimap<int, ATBDailyTicket> DailyTicket;
+	TimeRangeType TimeRange;
+	multimap<int, ATBTimeStepConfig> TimeStepConfig;
+	multimap<int, ATBTimeBase> TimeBase;
+	multimap<int, ATBCustomer> Customer;
+	TariffProductType TariffProduct;
+	TariffInterpolationType TariffInterpolations;
+	TariffPrepaidType TariffPrepaidOptions;
+	TariffCarryOverType TariffCarryOverOptions;
 
 	/// <summary>
 	/// Parse JSON string
@@ -85,6 +94,9 @@ public:
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
+    std::optional<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;
@@ -92,6 +104,8 @@ public:
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 
+    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
+
 private:
 	/// <summary>
 	/// Identify type of JSON member
@@ -100,5 +114,5 @@ private:
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
 
-    QVector<ATBPaymentOption> currentPaymentOptions;
+	QVector<ATBPaymentOption> currentPaymentOptions;
 };

library/include/mobilisis/duration.h

@@ -1,11 +1,40 @@
 #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;
 };

library/include/mobilisis/member_type.h

@@ -19,7 +19,10 @@ enum MemberType
     TimeBaseType = 0x0C,
     TimeRangeType = 0x0D,
     TimeStepConfigType = 0x0E,
-    ProductType = 0x0F
+    ProductType = 0x0F,
+    InterpolationType = 0x10,
+    PrepaidType = 0x11,
+    CarryOverType = 0x12
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -24,6 +24,11 @@ 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;
@@ -44,6 +49,9 @@ 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;
@@ -51,6 +59,8 @@ public:
     int pop_daily_card_price;
     uint64_t pop_business_hours;
     int pop_time_step_config;
+    bool pop_accumulate_prices;
+    bool pop_accumulate_durations;
 
     struct ATBMaxDateTime {
         int direction;

library/include/mobilisis/tariff_business_hours.h

@@ -8,27 +8,28 @@
 
 #include <Qt>
 
-#define _NO_RESTRICTION_24_7_               (uint64_t)(0ULL)
-#define _MON_                               (uint64_t)(1ULL << 8)
-#define _TUE_                               (uint64_t)(1ULL << 9)
-#define _WED_                               (uint64_t)(1ULL << 10)
-#define _THU_                               (uint64_t)(1ULL << 11)
-#define _FRI_                               (uint64_t)(1ULL << 12)
-#define _SAT_                               (uint64_t)(1ULL << 13)
-#define _SUN_                               (uint64_t)(1ULL << 14)
-#define _WEEK_DAYS_                         ((_MON_|_TUE_|_WED_|_THU_|_FRI_))
-#define _WORKING_DAYS_                      ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_))
-#define _ALL_DAYS_                          ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_|_SUN_))
-#define _OFFICIAL_HOLIDAY_                  (uint64_t)(1ULL << 15)
-#define _ONLY_WEEKEND_                      ((_SAT_|_SUN_))
-#define _ONLY_OPEN_FOR_BUSINESS_DAYS_       (uint64_t)(1ULL << 16)    /* verkaufsoffen */
-#define _WITH_RESTRICTED_HOURS_             (uint64_t)(1ULL << 17)
-#define _ALL_DAYS_WITH_RESTRICTED_HOURS_    ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_))
-#define _WEEKEND_WITH_RESTRICTED_HOURS_     ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_))
-#define _FRI_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_FRI_))
-#define _SAT_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_SAT_))
-#define _SUN_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_SUN_))
-#define _NOT_DEFINED_                       (uint64_t)(~0ULL)
+#define _NO_RESTRICTION_24_7_                   (uint64_t)(0ULL)
+#define _MON_                                   (uint64_t)(1ULL << 8)
+#define _TUE_                                   (uint64_t)(1ULL << 9)
+#define _WED_                                   (uint64_t)(1ULL << 10)
+#define _THU_                                   (uint64_t)(1ULL << 11)
+#define _FRI_                                   (uint64_t)(1ULL << 12)
+#define _SAT_                                   (uint64_t)(1ULL << 13)
+#define _SUN_                                   (uint64_t)(1ULL << 14)
+#define _WEEK_DAYS_                             ((_MON_|_TUE_|_WED_|_THU_|_FRI_))
+#define _WORKING_DAYS_                          ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_))
+#define _ALL_DAYS_                              ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_|_SUN_))
+#define _OFFICIAL_HOLIDAY_                      (uint64_t)(1ULL << 15)
+#define _ONLY_WEEKEND_                          ((_SAT_|_SUN_))
+#define _ONLY_OPEN_FOR_BUSINESS_DAYS_           (uint64_t)(1ULL << 16)    /* verkaufsoffen */
+#define _WITH_RESTRICTED_HOURS_                 (uint64_t)(1ULL << 17)
+#define _ALL_DAYS_WITH_RESTRICTED_HOURS_        ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_))
+#define _WEEKEND_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_))
+#define _WORKING_DAYS_WITH_RESTRICTED_HOURS_    ((_WITH_RESTRICTED_HOURS_|_WORKING_DAYS_))
+#define _FRI_WITH_RESTRICTED_HOURS_             ((_WITH_RESTRICTED_HOURS_|_FRI_))
+#define _SAT_WITH_RESTRICTED_HOURS_             ((_WITH_RESTRICTED_HOURS_|_SAT_))
+#define _SUN_WITH_RESTRICTED_HOURS_             ((_WITH_RESTRICTED_HOURS_|_SUN_))
+#define _NOT_DEFINED_                           (uint64_t)(~0ULL)
 
 enum BusinessHours : std::uint64_t
 {
@@ -62,6 +63,7 @@ enum BusinessHours : std::uint64_t
     ONLY_OPEN_FOR_BUSINESS_DAYS = _ONLY_OPEN_FOR_BUSINESS_DAYS_,
     ALL_DAYS_WITH_RESTRICTED_HOURS = _ALL_DAYS_WITH_RESTRICTED_HOURS_,
     WEEKEND_WITH_RESTRICTED_HOURS = _WEEKEND_WITH_RESTRICTED_HOURS_,
+    WORKING_DAYS_WITH_RESTRICTED_HOURS = _WORKING_DAYS_WITH_RESTRICTED_HOURS_,
     FRI_WITH_RESTRICTED_HOURS = _FRI_WITH_RESTRICTED_HOURS_,
     SAT_WITH_RESTRICTED_HOURS = _SAT_WITH_RESTRICTED_HOURS_,
     SUN_WITH_RESTRICTED_HOURS = _SUN_WITH_RESTRICTED_HOURS_,

library/include/mobilisis/tariff_carryover.h

@@ -0,0 +1,76 @@
+#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

library/include/mobilisis/tariff_global_defines.h

@@ -3,4 +3,18 @@
 
 #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

library/include/mobilisis/tariff_interpolation.h

@@ -0,0 +1,95 @@
+#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

library/include/mobilisis/tariff_permit_type.h

@@ -13,7 +13,13 @@ enum class PERMIT_TYPE : quint8 {
     DAY_TICKET_CHILD=6,
     INVALID=7,
     FOOD_STAMP=8,
-    TWENTY_FOUR_HOURS_TICKET=9
+    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
 };
 
 struct PermitType {
@@ -43,12 +49,30 @@ struct PermitType {
         case 6:
             m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
             break;
-        case 7:
+        case 8:
             m_permitType = PERMIT_TYPE::FOOD_STAMP;
             break;
-        case 8:
+        case 9:
             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;
         }
@@ -77,14 +101,25 @@ struct PermitType {
         case PERMIT_TYPE::DAY_TICKET_TEEN:
             return 6;
         case PERMIT_TYPE::FOOD_STAMP:
-            return 7;
-        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
             return 8;
+        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;
         default:
             break;
         }
         return 7;
-
     }
 
     QString toString() {
@@ -107,6 +142,18 @@ 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;
         }
@@ -133,6 +180,18 @@ 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;
         }

library/include/mobilisis/tariff_prepaid.h

@@ -0,0 +1,29 @@
+#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

library/include/mobilisis/utilities.h

@@ -79,12 +79,12 @@ namespace Utilities {
 	double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
 
     QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
-    QTime SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator it);
+    QTime SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator const &it);
     QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
-    QTime SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator it);
-    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    int WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
+    QTime SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator const &it);
+    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
+    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
+    int WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
     // PaymentRate GetPaymentRate(Configuration const *cfg, );
     bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId);
     bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId);
@@ -100,4 +100,5 @@ namespace Utilities {
     uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id);
     double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);
     QStringList dumpBusinessHours(uint64_t businessHours);
+    uint32_t getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId);
 }

library/library.pro

@@ -12,6 +12,10 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
 #Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
 #VERSION=1.0.0
 
+# 04.06.2024: Fix for Szeged: read price for daily ticket directly from entry
+#             PaymentOptions in tariff-file if it is not given as part of a
+#             Json-Product-Array in tariff-file.
+
 CONFIG(debug, debug|release) {
     win32 {
         QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
@@ -30,7 +34,8 @@ SOURCES += \
     src/configuration.cpp \
     src/tariff_log.cpp \
     src/calculate_price.cpp \
-    src/ticket.cpp
+    src/ticket.cpp \
+    src/tariff_global_defines.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -80,6 +85,10 @@ 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 \

library/src/calculate_price.cpp

@@ -10,6 +10,21 @@
 #include <QDebug>
 #include <QList>
 
+QString const CalcState::SUCCESS = "SUCCESS";
+QString const CalcState::ERROR_PARSING_ZONE_NR = "ERROR_PARSING_ZONE_NR";
+QString const CalcState::ERROR_LOADING_TARIFF = "ERROR_LOADING_TARIFF";
+QString const CalcState::ERROR_PARSING_TARIFF = "ERROR_PARSING_TARIFF";
+QString const CalcState::NEGATIVE_PARKING_TIME = "NEGATIVE_PARKING_TIME";
+QString const CalcState::INVALID_START_DATE = "INVALID_START_DATE";
+QString const CalcState::WRONG_PARAM_VALUES = "WRONG_PARAM_VALUES";
+QString const CalcState::WRONG_ISO_TIME_FORMAT = "WRONG_ISO_TIME_FORMAT";
+QString const CalcState::ABOVE_MAX_PARKING_TIME = "ABOVE_MAX_PARKING_TIME";
+QString const CalcState::BELOW_MIN_PARKING_TIME = "BELOW_MIN_PARKING_TIME";
+QString const CalcState::BELOW_MIN_PARKING_PRICE = "BELOW_MIN_PARKING_PRICE";
+QString const CalcState::ABOVE_MAX_PARKING_PRICE = "ABOVE_MAX_PARKING_PRICE";
+QString const CalcState::OVERPAID = "OVERPAID";
+QString const CalcState::OUTSIDE_ALLOWED_PARKING_TIME = "OUTSIDE_ALLOWED_PARKING_TIME";
+
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
 }
@@ -163,6 +178,17 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
             }
 
             return product_price;
+        } else {
+            // SZEGED
+            int const pop_daily_card_price = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qDebug() << QString("(%1:%2) no products defined in tariff-file").arg(__func__).arg(__LINE__);
+            qDebug() << QString("(%1:%2) pop_daily_card_price=%3").arg(__func__).arg(__LINE__).arg(pop_daily_card_price);
+
+            // static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+            // return Utilities::getDailyTicketCardPrice(cfg, paymentMethodId);
+
+            return pop_daily_card_price;
         }
     } break;
     case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
@@ -187,6 +213,26 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
         }
 
     } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
+        qCritical() << "TODO: SHORT_TERM_PARKING_PKW";
+    } 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: {
+        int const pop_daily_card_price = cfg->getPaymentOptions().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: {
+        qCritical() << "TODO: DAY_TICKET_BUS";
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CAMPER: {
+        qCritical() << "TODO: DAY_TICKET_CAMPER";
+    } break;
     default:
       break;
     }
@@ -346,8 +392,33 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
         (paymentMethodId == PaymentMethod::Progressive))
     {
-        const QList<int> stepList = Calculator::GetInstance().GetTimeSteps(tariff);
-        qCritical() << "   compute_next_timestep()     timeSteps:" << stepList;
+        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() << "   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 maxStep = -1;
+        if (size >= 2) {
+            maxStep = stepList[1] - stepList[0];
+        }
+        int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        for (int i=0; i < stepList.size(); ++i) {
+            if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
+                qCritical().noquote()
+                    << QString("   compute_next_timestep() correction stepList[%1]=%2 -> %3:")
+                                    .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
+                stepList[i] = currentTimeMinutes;
+                qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
+            }
+        }
 
         int currentStepIndex = stepList.indexOf(currentTimeMinutes);
 
@@ -427,7 +498,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     if (duration < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
                           .arg(end_parking_time, start_parking_time));
-        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
+        return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
     }
     if (duration > maxMin) {
         calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration).arg(maxMin));
@@ -487,6 +558,7 @@ 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;
 
@@ -495,7 +567,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         calcState.setDesc(QString("end=%1, start=%2")
                           .arg(end_parking_time.toString(Qt::ISODate),
                                start_parking_time.toString(Qt::ISODate)));
-        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
+        return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
     }
     if (netto_parking_time > maxMin) {
         calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
@@ -537,12 +609,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         }
         double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
         if (cost < minCost) {
-            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
         }
 
         // DEBUG
-        qCritical() << "               -> calculated cost (price->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;
@@ -603,16 +676,76 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                     tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
                     price, false, true).c_str();
-        ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
-        // DEBUG
-        qCritical() << "compute_duration_for_parking_ticket(): ";
-        qCritical() << "                 endTime: " << endTime;
-        qCritical() << "           ticketEndTime: " << ticketEndTime;
+        if (endTime == CalcState::SUCCESS) {
+            calcState.setDesc(QString("SUCCESS"));
+            calcState.setStatus(endTime);
+        } else
+        if (endTime == CalcState::ERROR_PARSING_ZONE_NR) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ERROR_LOADING_TARIFF) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ERROR_PARSING_TARIFF) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::NEGATIVE_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::INVALID_START_DATE) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::WRONG_PARAM_VALUES) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::WRONG_ISO_TIME_FORMAT) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ABOVE_MAX_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::BELOW_MIN_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::BELOW_MIN_PARKING_PRICE) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ABOVE_MAX_PARKING_PRICE) {
+            calcState.setDesc(CalcState::ABOVE_MAX_PARKING_PRICE);
+            calcState.setStatus(CalcState::ABOVE_MAX_PARKING_PRICE);
+            return calcState;
+        } else
+        if (endTime == CalcState::OVERPAID) {
+            calcState.setDesc(CalcState::OVERPAID);
+            calcState.setStatus(CalcState::OVERPAID);
+            return calcState;
+        } else
+        if (endTime == CalcState::OUTSIDE_ALLOWED_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else {
+            ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
-        if (!ticketEndTime.isValid()) {
-            calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
-            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+            // 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);
+            }
         }
     } else {
         return calcState.set(CalcState::State::INVALID_START_DATE);

library/src/calculator_functions.cpp

@@ -5,6 +5,7 @@
 #include "tariff_time_range.h"
 #include "ticket.h"
 #include "tariff_global_defines.h"
+#include "tariff_prepaid.h"
 
 #include <sstream>
 #include <algorithm>
@@ -30,6 +31,8 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
         return QDateTime();
     }
 
+    // qCritical() << __func__ << start_datetime.toString(Qt::ISODate);
+
     double day_price = 0.0f;
     int current_special_day_id = -1;
     bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
@@ -106,7 +109,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
             int diff = abs(inputDateTime.time().secsTo(worktime_to));
             inputDateTime = inputDateTime.addSecs(diff);
 
-            //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;            
+            //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
             return inputDateTime;
         }
     }
@@ -126,8 +129,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
     // Get input date
     QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
-
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
+    //qCritical() << DBG_HEADER << "          start" << inputDate.toString(Qt::ISODate);
+    //qCritical() << DBG_HEADER << "paymentMethodId" << static_cast<int>(paymentMethodId);
+
+    Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate);
+
     if (paymentMethodId == PaymentMethod::Steps) {
         if (tariffIs24_7(cfg)) {
             // use tariff with structure as for instance Schoenau, Koenigsee:
@@ -144,7 +152,245 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     }
                 }
 
-                qCritical() << __func__ << ":" << __LINE__ << "NOT YET IMPLEMENTED";
+                // TODO: man braucht den richtigen Index
+                int paymentOptionIndex = 0;
+                int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+                int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
+                int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+
+                if (cost > pop_max_price) {
+                    qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
+                    return CalcState::OVERPAID.toStdString();
+                }
+
+                if (cost < pop_min_price) {
+                    qCritical() << DBG_HEADER << "MIN-PARKING-PRICE" << pop_min_price << ", COST" << cost;
+                    return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
+                }
+
+                // int const pop_pre_paid = 1;
+
+                if (prepaid) {
+                    // no limits on pre-pay-option, i.e. pre-pay-ranges are exactly
+                    // the complements of operational-ranges
+
+                    // find out if we are in a pre-pay-range.
+                    // in this case, adapt inputDate accordingly.
+
+
+// #define DEBUG_GET_DURATION_FROM_COST 1
+#if DEBUG_GET_DURATION_FROM_COST==1
+                    qCritical() << DBG_HEADER << "PRE-PAID-OPTION: ADAPT-INPUT-DATE" << inputDate.toString(Qt::ISODate);
+#endif
+
+                    QTime currentTime = inputDate.time();
+                    int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
+
+                    bool useWeekDaysWorkTimeOfOtherDay = true;
+
+                    for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_day_in_week_id); iter != rEnd; ++iter) {
+                        QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
+                        QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
+
+                        if (inputDate.time() < pwd_time_from) {
+                            inputDate.setTime(pwd_time_from);
+                            useWeekDaysWorkTimeOfOtherDay = false;
+                            break;
+                        }
+                        if (currentTime <= pwd_time_to) {
+                            useWeekDaysWorkTimeOfOtherDay = false;
+                            break;
+                        }
+                    }
+
+                    if (useWeekDaysWorkTimeOfOtherDay) {// for the current day, we are above
+                                                        // the latest worktime-range -> find the next valid range
+
+                        QTime pwd_time_from_next_valid_range(0, 0, 0);
+                        int pwd_period_next_day_in_week_id = pwd_period_day_in_week_id;
+                        for (int days = 1; days < 8; ++days) {
+                            pwd_period_next_day_in_week_id += 1;
+                            if (pwd_period_next_day_in_week_id > (int)Qt::Sunday) {
+                                pwd_period_next_day_in_week_id = Qt::Monday;
+                            }
+
+                            if (cfg->WeekDaysWorktime.count(pwd_period_next_day_in_week_id) > 0) {
+                                for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_next_day_in_week_id); iter != rEnd; ++iter) {
+                                    QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
+                                    if (pwd_time_from_next_valid_range < pwd_time_from) {
+                                        pwd_time_from_next_valid_range = pwd_time_from;
+                                        break;
+                                    }
+                                }
+                                inputDate = inputDate.addDays(days);
+                                inputDate.setTime(pwd_time_from_next_valid_range);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+#if DEBUG_GET_DURATION_FROM_COST==1
+                qCritical() << DBG_HEADER << "(ADAPTED) INPUT-DATE" << inputDate.toString(Qt::ISODate);
+#endif
+
+                // inputDate is now located in a valid operational-working-range
+                // find this working-time-range
+                int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
+                if (cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id) == 0) {
+                    qCritical() << DBG_HEADER
+                                << "ERROR" << inputDate.toString(Qt::ISODate)
+                                << "NOT IN VALID WORKING TIME-RANGE";
+                    return "";
+                }
+
+                QTime current_working_time_from;
+                QTime current_working_time_to;
+
+                for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_day_in_week_id); iter != rEnd; ++iter) {
+                    QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
+                    QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
+                    if (pwd_time_from <= inputDate.time() && inputDate.time() <= pwd_time_to) {
+                        current_working_time_from = pwd_time_from;
+                        current_working_time_to = pwd_time_to;
+                    }
+                }
+
+                if (current_working_time_from.isNull() || current_working_time_to.isNull()) {
+                    // can never happen
+                    qCritical() << DBG_HEADER
+                                << "ERROR" << inputDate.toString(Qt::ISODate)
+                                << "NOT IN VALID WORKING TIME-RANGE";
+                    return "";
+                }
+
+#if DEBUG_GET_DURATION_FROM_COST==1
+                qCritical() << DBG_HEADER << "CURRENT WORKING-TIME-FROM" << current_working_time_from.toString(Qt::ISODate);
+                qCritical() << DBG_HEADER << "  CURRENT WORKING-TIME-TO" << current_working_time_to.toString(Qt::ISODate);
+#endif
+
+
+                int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
+                int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
+                int price = 0;
+                int durationInSecs = 0;
+                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                    int const pra_price = itr->second.pra_price;
+                    int const durationId = itr->second.pra_payment_unit_id;
+                    if (pop_accumulate_prices) {
+                        price += pra_price;
+                    } else {
+                        price = pra_price;
+                    }
+
+                    //qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
+
+                    auto search = cfg->Duration.find(durationId);
+                    if (search != cfg->Duration.end()) {
+                        // found now the duration in minutes
+                        // check if we are still inside the working-time-range
+                        ATBDuration duration = search->second;
+                        //if (pop_accumulate_durations) {
+                        //    durationInSecs += duration.pun_duration * 60;
+                        //} else {
+                            durationInSecs = duration.pun_duration * 60;
+                        //}
+
+                        if ((double)price == cost) {
+                            QDateTime current_working_date_time_to = inputDate;
+                            current_working_date_time_to.setTime(current_working_time_to);
+
+#if DEBUG_GET_DURATION_FROM_COST==1
+                            qCritical() << DBG_HEADER << "        DURATION ID" << duration.pun_id;
+                            qCritical() << DBG_HEADER << "DURATION IN MINUTES" << durationInSecs / 60;
+                            qCritical() << DBG_HEADER << "DURATION IN SECONDS" << durationInSecs;
+                            qCritical() << DBG_HEADER << "CURRENT-WORKING-DATE-TIME-TO"
+                                                      << current_working_date_time_to.toString(Qt::ISODate);
+                            qCritical() << DBG_HEADER << "NEW INPUT DATE" << inputDate.addSecs(durationInSecs).toString(Qt::ISODate);
+#endif
+
+                            if (inputDate.addSecs(durationInSecs) > current_working_date_time_to) {
+                                QTime next_working_time_from;
+                                if (cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over != 0) {
+#if DEBUG_GET_DURATION_FROM_COST==1
+                                    qCritical() << DBG_HEADER << "CARRY-OVER SET";
+#endif
+                                    // check for next working-time-range on same day
+                                    int day_in_week_id = inputDate.date().dayOfWeek();
+                                    for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(day_in_week_id); iter != rEnd; ++iter) {
+                                        QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
+                                        if (pwd_time_from > current_working_time_to) {
+                                            next_working_time_from = pwd_time_from;
+#if DEBUG_GET_DURATION_FROM_COST==1
+                                            qCritical() << DBG_HEADER << "NEXT-WORKING-TIME-FROM"
+                                                        << next_working_time_from.toString(Qt::ISODate);
+#endif
+                                            break;
+                                        }
+                                    }
+                                    // check for next working-time-range on following day(s)
+                                    if (next_working_time_from.isNull()) {
+                                        next_working_time_from = QTime(0, 0, 0);
+                                        for (int days = 1; days < 8; ++days) {
+                                            day_in_week_id += 1;
+                                            if (day_in_week_id > (int)Qt::Sunday) {
+                                                day_in_week_id = Qt::Monday;
+                                            }
+                                            if (cfg->WeekDaysWorktime.count(day_in_week_id) > 0) {
+                                                for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(day_in_week_id); iter != rEnd; ++iter) {
+                                                    QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
+                                                    if (next_working_time_from < pwd_time_from) {
+                                                        next_working_time_from = pwd_time_from;
+                                                        break;
+                                                    }
+                                                }
+
+                                                QDateTime upper = inputDate.addDays(days);
+                                                upper.setTime(next_working_time_from);
+
+                                                QDateTime lower = inputDate;
+                                                lower.setTime(current_working_time_to);
+
+                                                inputDate = inputDate.addSecs(lower.secsTo(upper) + durationInSecs);
+#if DEBUG_GET_DURATION_FROM_COST==1
+                                                qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
+#endif
+                                                break;
+                                            }
+                                        } // for (int days = 1; days < 8; ++days) {
+                                    } else { // next working-time is on same day
+                                        QDateTime upper = inputDate;
+                                        upper.setTime(next_working_time_from);
+
+                                        QDateTime lower = inputDate;
+                                        lower.setTime(current_working_time_to);
+
+                                        inputDate = inputDate.addSecs(lower.secsTo(upper) + durationInSecs);
+#if DEBUG_GET_DURATION_FROM_COST==1
+                                        qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
+#endif
+                                    }
+                                }
+                            } else {
+                                inputDate = inputDate.addSecs(duration.pun_duration * 60);
+
+#if DEBUG_GET_DURATION_FROM_COST==1
+                                qCritical() << DBG_HEADER << "INPUT-DATE" << inputDate.toString(Qt::ISODate);
+#endif
+
+                            }
+
+                            QString const &s = inputDate.toString(Qt::ISODate);
+
+#if DEBUG_GET_DURATION_FROM_COST==1
+                            qCritical() << DBG_HEADER << "TICKET-END" << s;
+#endif
+
+                            return s.toStdString();
+                        } // if ((double)price == cost) {
+                    }
+                }
+
                 return "";
             }
         }
@@ -623,17 +869,27 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
     qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
                 << "paymentOptionIndex" << paymentOptionIndex;
 
+    // TODO: wieder entfernen
+    return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", QTime(), QTime());
+
     QString errorStr = "UNKNOWN ERROR";
 
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
     if (paymentMethodId == PaymentMethod::Steps) {
         uint64_t const businessHours = cfg->getPaymentOptions(paymentOptionIndex).pop_business_hours;
+
         if (cfg->isDayIncluded(businessHours, start)) {
             if (businessHours == BusinessHours::NO_RESTRICTION_24_7) {
                 return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
                          QTime(0, 0, 0), QTime(23, 59, 59));
             }
+
             int const weekdayId = start.date().dayOfWeek();
+
+            // qCritical() << DBG_HEADER
+            //             << "weekdayId" << weekdayId
+            //             << "count" << cfg->WeekDaysWorktime.count(weekdayId);
+
             if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
                 using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
                 std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
@@ -648,8 +904,13 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
 
                     QTime const &startTime = start.time();
 
+                    // qCritical() << DBG_HEADER << "START TIME" << startTime.toString(Qt::ISODate);
+
                     if (startTime >= from && startTime <= until) {
                         QDateTime const end = start.addSecs(netto_parking_time*60);
+
+                        //qCritical() << DBG_HEADER << "END-DATE-TIME" << end.toString(Qt::ISODate);
+
                         QTime const endTime = end.time();
                         if (endTime <= until && start.date().dayOfWeek() == end.date().dayOfWeek()) {
                             qCritical() << DBG_HEADER;
@@ -670,28 +931,60 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                     }
 
                     int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
+
+                    // qCritical() << DBG_HEADER
+                    //             << "paymentOptionIndex" << paymentOptionIndex
+                    //             << "pop_carry_over" << pop_carry_over;
+
                     if (pop_carry_over == 1) {
-                        qCritical() << DBG_HEADER
-                                    << "NO. CHECK IF PARKING IS ALLOWED WITH CARRY-OVER ...";
+                        // qCritical() << DBG_HEADER
+                        //             << "NO. CHECK IF PARKING IS ALLOWED WITH CARRY-OVER ...";
 
                         int const pop_carry_over_start_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_start_time_range;
                         int const pop_carry_over_end_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_end_time_range;
 
+                        // qCritical() << DBG_HEADER
+                        //             << "pop_carry_over_start_time_range" << pop_carry_over_start_time_range
+                        //             << "pop_carry_over_end_time_range" << pop_carry_over_end_time_range;
+
+                        if ((int)cfg->TimeRange.count(pop_carry_over_start_time_range) <= 0 &&
+                            (int)cfg->TimeRange.count(pop_carry_over_end_time_range) <= 0) {
+
+                            qCritical() << DBG_HEADER << "PARKING_ALLOWED. startTime" << startTime.toString(Qt::ISODate);
+                            return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", startTime);
+
+                        } else
+                        // search entry in time-range-field of tariff-file
                         if (cfg->TimeRange.count(pop_carry_over_start_time_range) == 1 &&
                             cfg->TimeRange.count(pop_carry_over_end_time_range) == 1) {
 
                             ATBTimeRange s = cfg->TimeRange.find(pop_carry_over_start_time_range)->second;
                             ATBTimeRange e = cfg->TimeRange.find(pop_carry_over_end_time_range)->second;
 
+                            //qCritical() << DBG_HEADER << "startTime" << startTime.toString(Qt::ISODate);
+                            //qCritical() << DBG_HEADER << "s: time range from" << s.getTimeFrom().toString(Qt::ISODate);
+                            //qCritical() << DBG_HEADER << "s: time range until" << s.getTimeUntil().toString(Qt::ISODate);
+
                             if (startTime >= s.getTimeFrom() && startTime <= s.getTimeUntil()) {
+
                                 QDateTime sd = start;
                                 sd.setTime(s.getTimeUntil());
 
+                                //qCritical() << DBG_HEADER << "jumpFrom" << sd.toString(Qt::ISODate);
+
                                 QDateTime ed = start.addDays(1);
                                 ed.setTime(e.getTimeFrom());
 
+                                //qCritical() << DBG_HEADER << "to" << ed.toString(Qt::ISODate);
+
                                 int const jumpSecs = sd.secsTo(ed);
+
+                                //qCritical() << DBG_HEADER << "jumpSecs" << jumpSecs;
+
                                 QDateTime const end = start.addSecs(netto_parking_time*60 + jumpSecs);
+
+                                //qCritical() << DBG_HEADER << "new end" << end.toString(Qt::ISODate);
+
                                 if (end.time() <= e.getTimeUntil()) {
 
                                     qCritical() << DBG_HEADER
@@ -701,13 +994,13 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                                     return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
                                                      startTime, end.time());
                                 } else {
-                                    errorStr = QString("endTime %1 exceeds [%2, %3))")
+                                    errorStr = QString("endTime %1 outside [%2, %3))")
                                                   .arg(end.toString(Qt::ISODate))
                                                   .arg(sd.toString(Qt::ISODate))
                                                   .arg(ed.toString(Qt::ISODate));
                                 }
                             } else {
-                                errorStr = QString("startTime %1 exceeds [%2, %3))")
+                                errorStr = QString("startTime %1 outside [%2, %3))")
                                               .arg(startTime.toString(Qt::ISODate))
                                               .arg(s.getTimeFrom().toString(Qt::ISODate))
                                               .arg(s.getTimeUntil().toString(Qt::ISODate));
@@ -730,6 +1023,8 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
         }
     }
 
+    qCritical() << DBG_HEADER << "errorStr" << errorStr;
+
     return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, errorStr,
                      QTime(), QTime());
 }
@@ -1829,28 +2124,51 @@ QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
     return QList<int>();
 }
 
-QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const {
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "paymentOptionIndex:" << paymentOptionIndex;
+
+#define DEBUG_GET_TIME_STEPS (1)
+
+QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
+                                     QDateTime const &s) const {
+
+    // TEST
+    // paymentOptionIndex = 1;
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
+    }
 
     if (m_timeSteps.size() > paymentOptionIndex) {
-        //qCritical() << __PRETTY_FUNCTION__ << "timeSteps:" << m_timeSteps;
-        return m_timeSteps[paymentOptionIndex];
+
+        //if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
+        //    return m_timeSteps[paymentOptionIndex];
+        //}
+
+        // recompute time steps
+        m_timeSteps[paymentOptionIndex].clear();
+
     } else {
+        // int diff = paymentOp m_timeSteps.size()
         m_timeSteps.push_back(QList<int>());
     }
 
-    QDateTime start = QDateTime::currentDateTime();
-    start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
+    QDateTime start = s;
+    start.setTime(QTime(s.time().hour(), s.time().minute(), 0));
 
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
     int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
+    int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
 
     static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")        start parking time:" << start.toString(Qt::ISODate);
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")         payment option id:" << pop_id;
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option carry over:" << pop_carry_over;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")               payment option id:" << pop_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")         time step configuration:" << pop_time_step_config;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")               prepaid option id:" << pop_prepaid_option_id;
+    }
 
     if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
         //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
@@ -1864,11 +2182,36 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
         } else {
             uint16_t timeStepCompensation = 0;
 
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")       payment option carry over:" << pop_carry_over;
+            }
+
             if (pop_carry_over) {
                 int const pop_carry_over_time_range_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_time_range_id;
+                int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+                int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
                 QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
                 QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
 
+                if (DBG_LEVEL >= DBG_DEBUG) {
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range id:" << pop_carry_over_time_range_id;
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")            carry over option id:" << pop_carry_over_time_range_id;
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")            carry over time from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              carry over time to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
+                }
+
+                int weekDay = start.date().dayOfWeek();
+                QTime const carryOverStart = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+                QTime const carryOverEnd = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
+                int const carryOverDuration = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+                if (DBG_LEVEL >= DBG_DEBUG) {
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")         carry over start:" << carryOverStart.toString(Qt::ISODate);
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")           carry over end:" << carryOverEnd.toString(Qt::ISODate);
+                }
+
+                // TODO: reparieren
+
                 if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
                     if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
                         for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
@@ -1894,14 +2237,14 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
                                     // set dynamic minimal parking time
                                     cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = timeStep;
 
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")   computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
 
                                     duration.pun_duration = timeStep;
                                     timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
                                     m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                 } else {
                                     duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
-                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;;
+                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                 }
 
                                 cfg->Duration.erase(search);
@@ -1912,13 +2255,200 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
                             }
                         }
                     } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        // TODO
+                        if (DBG_LEVEL >= DBG_DEBUG) {
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")          carry over time range to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
+                        }
+
+                        m_timeSteps[paymentOptionIndex].clear();
+
+                        std::optional<QDateTime> prepaidStart = cfg->prepaidStart(start, pop_prepaid_option_id);
+                        // TODO: zusaetzlicher faktor falls vorkauf-option zieht
+                        if (prepaidStart) {
+                            start = prepaidStart.value();
+                            if (DBG_LEVEL >= DBG_DEBUG) {
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid adapted start:" << start.toString(Qt::ISODate);
+                            }
+                        } else {
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                        }
+
+                        // TODO: check if needed
+                        QDateTime interpolationEnd;
+                        std::optional<QDateTime> interpolationEndDate = cfg->getInterpolationEnd(start, paymentOptionIndex);
+                        if (interpolationEndDate) {
+                            interpolationEnd = interpolationEndDate.value();
+                            if (DBG_LEVEL >= DBG_DEBUG) {
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")             interpolation end:" << interpolationEnd.toString(Qt::ISODate);
+                            }
+                        } else {
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                        }
+
+                        // int const start_time = start.time().hour() * 60 + start.time().minute();
+                        QDateTime nextTimeStep = start;
+                        int runtimeInMinutes = 0;
+
+                        int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
+
+                        // TODO: auslagern
+                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                            int const durationId = itr->second.pra_payment_unit_id;
+
+                            auto search = cfg->Duration.find(durationId);
+                            if (search != cfg->Duration.end()) {
+                                ATBDuration duration = search->second;
+                                duration.pun_duration = duration.pun_duration_saved;
+                                search->second = duration;
+                            }
+                        }
+
+                        for (auto[itr, rangeEnd] = cfg->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 = cfg->Duration.find(durationId);
+                            if (search != cfg->Duration.end()) {
+                                ATBDuration duration = search->second;
+                                ATBDuration &previous = 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 = cfg->getInterpolationType(duration.pun_interpolation_id);
+                                if (ipolCheck) {
+                                    ATBInterpolation interpolation = ipolCheck.value();
+
+                                    if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE) {
+
+                                        interpolation.dynamic_start = start.time();
+                                        interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
+
+                                        // int const end_time = interpolation.dynamic_end.hour() * 60 + interpolation.dynamic_end.minute();
+
+                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun_duration:" << duration.pun_duration;
+                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                 pun_interpolation:" << duration.pun_interpolation_id;
+                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")         interpolation dynamic end:" << interpolationEnd.toString(Qt::ISODate);
+                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")    interpolation dynamic end time:" << end_time;
+
+                                        int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+
+                                        runtimeInMinutes += duration.pun_duration;
+                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
+
+                                        if (nextTimeStep.time() > carryOverStart) {
+                                            int const backTime = carryOverStart.secsTo(nextTimeStep.time()) / 60;
+                                            runtimeInMinutes -= backTime;
+                                            nextTimeStep.setTime(carryOverStart);
+                                            nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
+                                            runtimeInMinutes += (backTime + carryOverDuration);
+                                        }
+
+                                        if (DBG_LEVEL >= DBG_DEBUG) {
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                runtime in minutes:" << runtimeInMinutes;
+                                        }
+
+                                        int rest = nextTimeStep.secsTo(interpolationEnd);
+                                        if (nextTimeStep <= interpolationEnd) {
+                                            if (rest > 0 && rest < duration.pun_duration) {
+                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    rest minutes:" << rest;
+                                                // last time step before switching to dayticket (see Schnals 505/506)
+                                                //if (duration.pun_duration > 0) {
+                                                //    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
+                                                //}
+                                            } else {
+                                                m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+                                            }
+                                        }
+
+                                        duration.pun_duration = runtimeInMinutes;
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
+
+                                        search->second = duration;
+                                    } else
+                                    if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
+#if 0
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+                                        QDateTime s = start.addSecs(runtimeInMinutes * 60);
+                                        int const minutes = s.time().secsTo(carryOverStart) / 60;
+
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            minutes:" << minutes;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            start:" << start.toString(Qt::ISODate);
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            s:" << s.toString(Qt::ISODate);
+                                        if (minutes > 0) {
+                                            runtimeInMinutes += minutes;
+                                            previous.pun_duration += minutes;
+
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")      previous:" << previous.pun_duration;
+
+                                            if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
+                                                m_timeSteps[paymentOptionIndex].last() += minutes;
+                                            }
+                                        }
+#endif
+
+                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (0):" << runtimeInMinutes;
+
+                                        runtimeInMinutes += duration.pun_duration;
+                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                  carry over start:" << carryOverStart.toString(Qt::ISODate);
+
+                                        // TOOO: truncate-flag == false
+                                        if (nextTimeStep.time() > carryOverStart) {
+                                            int const backTime = carryOverStart.secsTo(nextTimeStep.time());
+                                            runtimeInMinutes -= backTime;
+                                            nextTimeStep.setTime(carryOverStart);
+                                            nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
+                                            runtimeInMinutes += (backTime + carryOverDuration);
+                                        } else
+                                        if (nextTimeStep.time() < carryOverStart) {
+                                            int const forwardTime = nextTimeStep.time().secsTo(carryOverStart) / 60;
+                                            runtimeInMinutes += forwardTime;
+                                            nextTimeStep.setTime(carryOverStart);
+                                        }
+
+                                        if (DBG_LEVEL >= DBG_DEBUG) {
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
+                                        }
+
+                                        duration.pun_duration = runtimeInMinutes;
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
+
+                                        m_timeSteps[paymentOptionIndex] << duration.pun_duration;
+                                        search->second = duration;
+                                    } else {
+                                        cfg->Duration.erase(search);
+                                    }
+                                }
+                            }
+                        }
                     }
                 } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                     // TODO
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
                 }
             } else { // if (pop_carry_over) {
                 // TODO
+                 qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
             }
         }
     } else {
@@ -1939,14 +2469,35 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
         }
     }
 
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NEW timeSteps:" << m_timeSteps;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
+
+        for (int i = 0; i < m_timeSteps[paymentOptionIndex].size(); ++i) {
+            QDateTime nextTime = s;
+            // nextTime.setTime(QTime(0, 0, 0));
+            int const secs = m_timeSteps[paymentOptionIndex][i] * 60;
+            nextTime = nextTime.addSecs(secs);
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") step"
+                        << i << secs << m_timeSteps[0][i] << "->" << nextTime.toString(Qt::ISODate);
+
+        }
+    }
 
     return m_timeSteps[paymentOptionIndex];
 }
 
+#undef DEBUG_GET_TIME_STEPS
+
 uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const {
 
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+    int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
+
+    uint32_t price = 0;
+
+    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -1956,8 +2507,18 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
         Q_ASSERT(pun_id == payment_unit_id);
 
         int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        if (pop_accumulate_prices) {
+            price += itr->second.pra_price;
+        } else {
+            price = (uint32_t)(itr->second.pra_price);
+        }
+
+        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
+        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << cfg->Duration.find(payment_unit_id)->second.pun_id;
+        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
+
         if (timeStep == pun_duration) {
-            return (uint32_t)(itr->second.pra_price);
+            return price;
         }
     }
 
@@ -2007,6 +2568,9 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
         if (dailyTickets) {
             QVector<ATBDailyTicket> const tickets = dailyTickets.value();
             switch (permitType) {
+                case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
+                    // TODO
+                } break;
                 case PERMIT_TYPE::FOOD_STAMP: {
                     // TODO
                 } break;

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* start_datetime, // given in local time
-                                            double price,
+                                            char const *startDatetimePassed, // given in local time
+                                            double cost,
                                             bool nextDay,
                                             bool prepaid)
 {
@@ -124,14 +124,14 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     Q_UNUSED(nextDay);
 
     // Get input date
-    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
+    QDateTime inputDate = QDateTime::fromString(startDatetimePassed,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, price) * 60);
+            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
             return inputDate.toString(Qt::ISODate).toStdString();
         } else {
             if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
@@ -147,9 +147,226 @@ 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, price, prepaid);
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);
 
     // qCritical().noquote() << t;
 
@@ -279,9 +496,11 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                         end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
                         return cost;
                     }
+                } else {
+                    // it might be that in such a case even prepaid ("vorkauf")
+                    // is not allowed at any moment
                 }
-
-                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
                 end_datetime = QDateTime();
                 return 0;
             }
@@ -299,34 +518,18 @@ 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 ((timeRanges = cfg->WeekDaysWorktime.count(weekdayId)) == 0) {
+            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
                 current = current.addDays(1);
                 weekdayId = current.date().dayOfWeek();
                 if (weekdayId == weekdayIdLast) {
@@ -335,11 +538,6 @@ 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);
 
@@ -347,235 +545,169 @@ 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) {
-                QDateTime const dt = start;
-                start = start.addDays(1);
-                start.setTime(QTime(0, 0, 0));
+                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;
+                    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);
+            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;
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                ++range;
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+                QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
 
-                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+                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 (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) {
-                        if (prepaid) {
-                            lastCurrent = current;
-                            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) {
-                                start_datetime = current;
-                            }
+                        if (range == 1) {
+                            start_datetime = current;
                         }
                     }
+                }
 
-#if DEBUG==1
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                << "from" << from.toString(Qt::ISODate)
-                                << "to" << to.toString(Qt::ISODate)
+                for (auto timeRangeIt = cfg->TimeRange.cbegin(); timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+
+                    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;
+
+                    qCritical() << __func__ << ":" << __LINE__
                                 << "current" << current.toString(Qt::ISODate)
-                                << "durationMinutes" << durationMinutes;
-#endif
+                                << "duration" << duration
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver;
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
-                        ATBTimeRange timeRange = timeRangeIt->second;
 
-                        timeRange.computeQTimes(current.time());
+                    //if (minsUsed > 0) {
+                    //    duration -= minsUsed;
+                    //    minsUsed = 0;
+                    //}
 
-                        int duration = timeRange.time_range_to_in_minutes_from_start -
-                                       timeRange.time_range_from_in_minutes_from_start;
-
-#if DEBUG==1
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                    << "duration" << duration << timeRange.time_range_id
-                                    << "current" << current.toString(Qt::ISODate)
-                                    << "minsToCarryOver" <<  minsToCarryOver
-                                    << "durationMinutes" << durationMinutes;
-#endif
-
-                        if (current.addSecs(duration * 60).time() <= to) {
-
-                            for(const auto &x: cfg->PaymentRate) {
-                                ATBPaymentRate const rate = x.second;
-                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    if (minsToCarryOver > 0) {
-                                        durationMinutes -= minsToCarryOver;
-                                        durationMinutesNetto += minsToCarryOver;
-                                        durationMinutesBrutto += minsToCarryOver;
-                                        current = current.addSecs(minsToCarryOver*60);
-                                        minsToCarryOver = 0;
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "durationMinutes" << durationMinutes
-                                                    << "durationMinutesNetto" << durationMinutesNetto
-                                                    << "durationMinutesBrutto" << durationMinutesBrutto
-                                                    << "current" << current.toString(Qt::ISODate);
-#endif
-                                    } else {
+                    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;
 
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "duration" << duration
-                                                    << "durationMinutes" << durationMinutes
-                                                    << "durationMinutesNetto" << durationMinutesNetto
-                                                    << "durationMinutesBrutto" << durationMinutesBrutto;
-#endif
-
                                         current = current.addSecs(duration * 60);
 
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "current" << current.toString(Qt::ISODate)
-                                                    << "price" << price;
-#endif
-                                    }
+                                        if (durationMinutes <= 0) {
+                                            end_datetime = current;
+                                            return price;
+                                        }
 
-                                    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;
-
-                        } else {
-
-                            lastCurrent = current;
-                            current.setTime(to);
-                            int const minsLeft = lastCurrent.secsTo(current) / 60;
-
-                            // mod duration: possibly discard some minutes in
-                            // the next time-range
-                            minsToCarryOver = (durationMinutes - minsLeft) % duration;
-
-                            durationMinutes -= minsLeft;
-                            durationMinutesNetto += minsLeft;
-                            durationMinutesBrutto += minsLeft;
-
-#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;
                                     }
                                 }
+                            } else {
+                                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;
 
-                            break;
+                                    durationMinutes -= duration;
+                                    durationMinutesNetto += duration;
+                                    durationMinutesBrutto += duration;
+
+                                    current = current.addSecs(duration * 60);
+                                    break;
+                                }
+                            }
                         }
+
+                        if (durationMinutes <= 0) {
+                            end_datetime = current;
+                            return price;
+                        }
+
+                        //++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;
+                                    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);
             }
         }
@@ -1072,6 +1204,8 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
 
+    static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
     qCritical() << __func__ << ":" << __LINE__ << "       start parking time:" << start.toString(Qt::ISODate);
     qCritical() << __func__ << ":" << __LINE__ << "        payment option id:" << pop_id;
     qCritical() << __func__ << ":" << __LINE__ << "payment option carry over:" << pop_carry_over;
@@ -1079,63 +1213,71 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
         //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
 
-        uint16_t timeStepCompensation = 0;
+        if (paymentMethodId == PaymentMethod::Progressive) { // e.g. neuhauser kirchdorf (743)
+            std::size_t const s = cfg->TimeRange.size();
+            for (std::size_t id = 1; id <= s; ++id) {
+                int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
+                m_timeSteps.append(step);
+            }
+        } else {
+            uint16_t timeStepCompensation = 0;
 
-        if (pop_carry_over) {
-            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
-            QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
-            QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
+            if (pop_carry_over) {
+                int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+                QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
+                QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
 
-            if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
-                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                        int const durationId = itr->second.pra_payment_unit_id;
-                        auto search = cfg->Duration.find(durationId);
-                        if (search != cfg->Duration.end()) {
-                            ATBDuration duration = search->second;
-                            if (durationId == 1) {
-                                QDateTime carryOver = start;
-                                carryOver = carryOver.addDays(1);
-                                carryOver.setTime(QTime(0, 0, 0));
+                if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
+                    if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                            int const durationId = itr->second.pra_payment_unit_id;
+                            auto search = cfg->Duration.find(durationId);
+                            if (search != cfg->Duration.end()) {
+                                ATBDuration duration = search->second;
+                                if (durationId == 1) {
+                                    QDateTime carryOver = start;
+                                    carryOver = carryOver.addDays(1);
+                                    carryOver.setTime(QTime(0, 0, 0));
 
-                                int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
-                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
-                                    qCritical()
-                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
-                                            .arg(timeStep).arg(duration.pun_duration_min)
-                                            .arg(timeStep).arg(duration.pun_duration_max);
-                                    break;
+                                    int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
+                                    if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                        qCritical()
+                                            << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                                .arg(timeStep).arg(duration.pun_duration_min)
+                                                .arg(timeStep).arg(duration.pun_duration_max);
+                                        break;
+                                    }
+                                    qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+
+                                    // set dynamic minimal parking time
+                                    cfg->getPaymentOptions().pop_min_time = timeStep;
+
+                                    qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+
+                                    duration.pun_duration = timeStep;
+                                    timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
+                                    m_timeSteps << duration.pun_duration;
+                                } else {
+                                    duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
+                                    m_timeSteps << duration.pun_duration;;
                                 }
-                                qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
 
-                                // set dynamic minimal parking time
-                                cfg->getPaymentOptions().pop_min_time = timeStep;
+                                cfg->Duration.erase(search);
+                                cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
 
-                                qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
-
-                                duration.pun_duration = timeStep;
-                                timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
-                                m_timeSteps << duration.pun_duration;
-                            } else {
-                                duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
-                                m_timeSteps << duration.pun_duration;;
+                            } else { // if (search != cfg->Duration.end()) {
+                               // TODO
                             }
-
-                            cfg->Duration.erase(search);
-                            cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
-
-                        } else { // if (search != cfg->Duration.end()) {
-                           // TODO
                         }
+                    } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                        // TODO
                     }
-                } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                     // TODO
                 }
-            } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
+            } else { // if (pop_carry_over) {
                 // TODO
             }
-        } else { // if (pop_carry_over) {
-            // TODO
         }
     } else {
         qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";
@@ -1308,6 +1450,18 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                 case PERMIT_TYPE::INVALID:
                     break;
             }
+        } else {
+            // for projects which have not defined a daily ticket in their
+            // tariff-files (e.g. szeged)
+            price.netto = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+            qCritical() << "                  start:" << startDatetime.toString(Qt::ISODate);
+            qCritical() << "          workTime from:" << QTime::fromString(QString(wt.pwd_time_from.c_str()), Qt::ISODate);
+            qCritical() << "            workTime to:" << QTime::fromString(QString(wt.pwd_time_to.c_str()), Qt::ISODate);
+            qCritical() << "daily_ticket_card_price:" << price.netto;
+
+            value = value.value_or(price);
         }
     }
 

library/src/configuration.cpp

@@ -6,6 +6,8 @@
 #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>
@@ -14,102 +16,108 @@
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
 {
-	if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
-	if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
-	if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
-	if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
-	if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
-	//if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
-	if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
-	if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
-	if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
-	if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
+    if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
+    if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
+    if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
+    if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
+    if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
+    //if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
+    if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
+    if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
+    if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
     if (strcmp(member_name, "DailyTicket") == 0) return MemberType::DailyTicketType;
     if (strcmp(member_name, "TimeBase") == 0) return MemberType::TimeBaseType;
     if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
     if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType;
     if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType;
     if (strcmp(member_name, "Product") == 0) return MemberType::ProductType;
+    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;
 }
 
 /// <inheritdoc/>
 bool Configuration::ParseJson(Configuration* cfg, const char* json)
 {
-	try
-	{
-		if (cfg == nullptr)
-		{
-			printf("TariffConfiguration pointer not set\n");
-			return false;
-		}
-		if (json == NULL)
-		{
-			printf("%s", "Input JSON string is NULL\n");
-			return false;
-		}
+        try
+        {
+            if (cfg == nullptr)
+            {
+                    printf("TariffConfiguration pointer not set\n");
+                    return false;
+            }
+            if (json == NULL)
+            {
+                    printf("%s", "Input JSON string is NULL\n");
+                    return false;
+            }
 
-		// Parse JSON to document
-		Document document;
-		document.Parse(json);
+            // Parse JSON to document
+            Document document;
+            document.Parse(json);
 
-		// Return if parse error has been found
-		ParseErrorCode err = document.GetParseError();
-		if (err != 0)
-		{
-			printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
-			return false;
-		}
+            // Return if parse error has been found
+            ParseErrorCode err = document.GetParseError();
+            if (err != 0)
+            {
+                    printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
+                    return false;
+            }
 
-		// Validate JSON, check if it's a JSON object
-        qCritical() << "JSON parsing has been successful";
-		if (!document.IsObject()) {
-			printf("%s", "Error: not a (valid) JSON object\n");
-			return false;
-		}
-        qCritical() << "Valid JSON object identified";
+            // Validate JSON, check if it's a JSON object
+            qCritical() << "JSON parsing has been successful";
+                if (!document.IsObject()) {
+                        printf("%s", "Error: not a (valid) JSON object\n");
+                        return false;
+                }
+            qCritical() << "Valid JSON object identified";
 
-		// Validate JSON, check configuration members
-		if (!document.HasMember("Currency")
-			|| !document.HasMember("PaymentMethod")
-			|| !document.HasMember("PaymentOption")
-			|| !document.HasMember("PaymentRate")
-			|| !document.HasMember("Duration")
-			//|| !document.HasMember("WeekDays")
-            //|| !document.HasMember("SpecialDaysWorktime")
-            //|| !document.HasMember("SpecialDays")
-            )
-		{
-			printf("%s", "Error: not a valid configuration JSON\n");
-			return false;
-		}
-        qCritical() << "Valid JSON configuration identified";
+                // Validate JSON, check configuration members
+                if (!document.HasMember("Currency")
+                        || !document.HasMember("PaymentMethod")
+                        || !document.HasMember("PaymentOption")
+                        || !document.HasMember("PaymentRate")
+                        || !document.HasMember("Duration")
+                        //|| !document.HasMember("WeekDays")
+                    //|| !document.HasMember("SpecialDaysWorktime")
+                    //|| !document.HasMember("SpecialDays")
+                )
+                {
+                        printf("%s", "Error: not a valid configuration JSON\n");
+                        return false;
+                }
+            qCritical() << "Valid JSON configuration identified";
 
-        ATBCurrency Currency;
-        ATBDuration Duration;
-        ATBPaymentMethod PaymentMethod;
-        ATBPaymentRate PaymentRate;
-        ATBSpecialDaysWorktime SpecialDaysWorktime;
-        ATBSpecialDays SpecialDays;
-        ATBWeekDays  WeekDays;
-        ATBWeekDaysWorktime  WeekDaysWorktime;
-        ATBPeriodYear YearPeriod;
-        ATBDailyTicket DailyTicket;
-        ATBTimeBase TimeBase;
-        ATBCustomer Customer;
-        ATBTimeRange TimeRange;
-        ATBTimeStepConfig TimeStepConfig;
-        ATBTariffProduct TariffProduct;
+            ATBCurrency Currency;
+            ATBDuration Duration;
+            ATBPaymentMethod PaymentMethod;
+            ATBPaymentRate PaymentRate;
+            ATBSpecialDaysWorktime SpecialDaysWorktime;
+            ATBSpecialDays SpecialDays;
+            ATBWeekDays  WeekDays;
+            ATBWeekDaysWorktime  WeekDaysWorktime;
+            ATBPeriodYear YearPeriod;
+            ATBDailyTicket DailyTicket;
+            ATBTimeBase TimeBase;
+            ATBCustomer Customer;
+            ATBTimeRange TimeRange;
+            ATBTimeStepConfig TimeStepConfig;
+            ATBTariffProduct TariffProduct;
+            ATBInterpolation TariffInterpolation;
+            ATBPrepaid TariffPrepaidOption;
+            ATBCarryOver TariffCarryOver;
 
-        MemberType mb_type = MemberType::UnknownType;
-        this->currentPaymentOptions.clear();
+            MemberType mb_type = MemberType::UnknownType;
+            this->currentPaymentOptions.clear();
 
-		// Get all JSON object members
-		// This code should run only once (to load JSON variables into memory)
-		for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
-		{
-			// Get name of all general members of JSON, don't print name if NULL
-			const char* mb_name = i->name.GetString();
+                // Get all JSON object members
+                // This code should run only once (to load JSON variables into memory)
+                for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
+                {
+                        // Get name of all general members of JSON, don't print name if NULL
+                        const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
             if (document[mb_name].IsString()) {
@@ -135,35 +143,212 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 
             qCritical() << " -" << mb_name;
 
-			// Get array for each JSON object member
-			auto mb_array = document[mb_name].GetArray();
-			if (mb_array.Size() <= 0) break;
+            // Get array for each JSON object member
+            auto mb_array = document[mb_name].GetArray();
+            if (mb_array.Size() <= 0) break;
 
-			//Iterate over provided array
-            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;
+                        //Iterate over provided array
+            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;
 
-				// Iterate over inner object JSON members
-				for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
-				{
-					// Get inner object JSON member, don't print name if NULL
-					const char* inner_obj_name = k->name.GetString();
-					if (inner_obj_name == NULL)
-					{
-						printf("Inner object name is NULL\n");
-						continue;
-					}
+                // Iterate over inner object JSON members
+                for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
+                {
+                    // Get inner object JSON member, don't print name if NULL
+                    const char* inner_obj_name = k->name.GetString();
+                    if (inner_obj_name == NULL)
+                    {
+                            printf("Inner object name is NULL\n");
+                            continue;
+                    }
 
-					// Identify member type
-					mb_type = IdentifyJsonMember(mb_name);
+                    // Identify member type
+                    mb_type = IdentifyJsonMember(mb_name);
 
-					switch (mb_type)
-					{
-					case MemberType::UnknownType:
-						break;
+                    switch (mb_type)
+                    {
+                    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()) {
@@ -375,22 +560,22 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         }
                         break;
                     case MemberType::CurrencyType:
-						if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
-						break;
-					case MemberType::PaymentMethodType:
-						if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
-						break;
-					case MemberType::PaymentRateType:
-						if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
-						break;
-					case MemberType::PaymentOptionType:
+                        if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
+                        break;
+                    case MemberType::PaymentMethodType:
+                        if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
+                        break;
+                    case MemberType::PaymentRateType:
+                        if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
+                        break;
+                    case MemberType::PaymentOptionType:
                         if (strcmp(inner_obj_name, "pop_id") == 0) {
                             this->currentPaymentOptions.append(ATBPaymentOption());
                             this->currentPaymentOptions.last().reset();
@@ -413,6 +598,16 @@ 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) {
@@ -493,103 +688,106 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             }
                         }
                         break;
-					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();
-                        else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
+                    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_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();
-						else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
-						break;
-					/*case MemberType::WeekDaysType:
-						if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
-						break;*/
-					case MemberType::WeekDaysWorkTimeType:
-						if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_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();
+                     case MemberType::SpecialDaysWorktimeType:
+                        if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
+                        break;
+                /*case MemberType::WeekDaysType:
+                        if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
+                        break;*/
+                     case MemberType::WeekDaysWorkTimeType:
+                        if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_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();
                         else if (strcmp(inner_obj_name, "pwd_time_to") == 0) WeekDaysWorktime.pwd_time_to = k->value.GetString();
                         break;
-					case MemberType::SpecialDaysType:
-						if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
-						else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
-						else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
-						else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
+                     case MemberType::SpecialDaysType:
+                        if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "ped_payment_option_id") == 0) SpecialDays.ped_payment_option_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "ped_year") == 0) SpecialDays.ped_year = k->value.GetInt();
-						break;
-					case MemberType::PeriodYearType:
-						if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
-						break;
-					default:
-						break;
-					}
+                        break;
+                     case MemberType::PeriodYearType:
+                        if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
+                        break;
+                    default:
+                        break;
+                    }
 //#pragma endregion
-				}
+                }
 
-				// Push to specific list depending on member type
-				switch (mb_type)
-				{
-				case MemberType::UnknownType:
-					break;
-				case MemberType::PaymentMethodType:
-					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
-					break;
+                                // Push to specific list depending on member 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;
+                    // qCritical() << "PaymentRate" << PaymentRate.pra_price << PaymentRate.pra_payment_option_id;
                     cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
-					break;
+                    break;
                 case MemberType::PaymentOptionType: {
                     if (!this->currentPaymentOptions.isEmpty()) {
                         ATBPaymentOption const &PaymentOption = this->currentPaymentOptions.last();
                         cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
                     }
                 } break;
-				case MemberType::DurationType:
-					cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
-					break;
-				case MemberType::SpecialDaysWorktimeType:
-					cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
-					break;
-				//case MemberType::WeekDaysType:
-				//	cfg->WeekDays.insert(pair<int, ATBWeekDays>(WeekDays.pdiw_index, WeekDays));
-				//	break;
-				case MemberType::WeekDaysWorkTimeType:
-					cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
-					break;
-				case MemberType::SpecialDaysType:
-					cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
-					break;
-				case MemberType::PeriodYearType:
-					cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
-					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));
+                    break;
+                                //case MemberType::WeekDaysType:
+                                //      cfg->WeekDays.insert(pair<int, ATBWeekDays>(WeekDays.pdiw_index, WeekDays));
+                                //      break;
+                case MemberType::WeekDaysWorkTimeType:
+                    cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
+                    break;
+                case MemberType::SpecialDaysType:
+                    cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
+                    break;
+                case MemberType::PeriodYearType:
+                    cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
+                    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));
@@ -601,20 +799,152 @@ 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;
+                    // 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;
                 default:
-					break;
-				}
-			}
-		}
-		return true;
-	}
-	catch (...) {
-		printf("%s\n", "General exception has occurred while parsing JSON\n");
-		return false;
-	}
+                     break;
+                }
+            }
+        }
+        return true;
+    }
+    catch (...) {
+        printf("%s\n", "General exception has occurred while parsing JSON\n");
+        return false;
+    }
 }
 
+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__ << ") TODO";
+                    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();
@@ -840,6 +1170,51 @@ 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;

library/src/tariff_global_defines.cpp

@@ -0,0 +1,5 @@
+#include "tariff_global_defines.h"
+
+int DBG_LEVEL = DBG_NOTICE;
+// int DBG_LEVEL = DBG_INFORMATION;
+// int DBG_LEVEL = DBG_DEBUG;

library/src/utilities.cpp

@@ -334,11 +334,11 @@ QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDa
     return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_from.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator it) {
+QTime Utilities::SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator const &it) {
     return QTime::fromString(it->second.pedwt_time_from.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator it) {
+QTime Utilities::SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator const &it) {
     return QTime::fromString(it->second.pedwt_time_to.c_str(), Qt::ISODate);
 }
 
@@ -346,15 +346,15 @@ QTime Utilities::SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialD
     return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_to.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
     return QTime::fromString(itr->second.pwd_time_from.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
     return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate);
 }
 
-int Utilities::WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+int Utilities::WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
     return itr->second.pwd_period_day_in_week_id;
 }
 
@@ -406,6 +406,10 @@ uint32_t Utilities::getMaximalParkingPrice(Configuration const *cfg, PaymentMeth
     return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_price, 0);
 }
 
+uint32_t Utilities::getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_daily_card_price, 0);
+}
+
 uint32_t Utilities::getTimeRangeStep(Configuration const *cfg, int step, PaymentMethod methodId) {
     if (methodId == PaymentMethod::Progressive) {
         Configuration::TimeRangeType::const_iterator it = cfg->TimeRange.find(step);

main/MessageHelper.cpp

@@ -0,0 +1,882 @@
+#include "MessageHelper.h"
+#include "terminal_utils.h"
+#include "aes128.h"
+
+#include <QDateTime>
+#include <QDebug>
+
+#define IUC_ASYNCHPOS_COINCOIDE_H               0x09
+#define IUC_ASYNCHPOS_COINCOIDE_L               0x78
+#define IUC_ASYNCHPOS_MAX_ARRAY_SIZE	        1024
+#define IUC_ASYNCHPOS_MAX_TX_PACKET_SIZE	    300
+#define IUC_ASYNCHPOS_MAX_RX_PACKET_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 PACKET_ID_SIZE      8
+#define MAX_POSID_LENGTH    255
+
+#define STX     ((char)0x01)
+#define ETX1    ((char)0x02)
+#define ETX2    ((char)0x03)
+#define EOT     ((char)0x04)
+#define ENQ     ((char)0x05)
+#define ACK1    ((char)0x06)
+#define ACK2    ((char)0x07)
+#define DLE     ((char)0x10)
+#define NAK     ((char)0x15)
+
+
+#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
+
+static int DBG_LEVEL = DBG_INFORMATION;
+//static int DBG_LEVEL = DBG_DEBUG;
+
+struct MessageHeader {
+    uint8_t packetType;
+    uint8_t packetID[PACKET_ID_SIZE];
+    uint8_t POSIDLength;
+    uint8_t POSID[MAX_POSID_LENGTH];
+};
+
+
+MessageHelper::AsynchBillData MessageHelper::m_asyncBillData;
+MessageHelper::AuthorizationResult MessageHelper::m_authorizationResult;
+
+MessageHelper::MessageHelper(QString const &posID, QString const &apak)
+  : m_posID(posID.toUtf8().constData())
+  , m_posIDLength(m_posID.size())
+  , m_messageHeaderPrefix(1 + PACKET_ID_SIZE + 1, 0x00)
+  , m_rawPacket(IUC_ASYNCHPOS_MAX_TX_PACKET_SIZE, 0x00) {
+    m_messageHeaderPrefix[9] = (uint8_t)m_posID.size();
+
+    for (int p = 0; p < apak.size(); p+=2) {
+        uint8_t n = strtoul(apak.mid(p, 2).toStdString().c_str(), nullptr, 16);
+        m_apak.push_back(n);
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << apak << m_apak.toHex(':');
+        qCritical() << DBG_HEADER << m_posID.toHex(':');
+        qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+    }
+}
+
+MessageHelper::MessageHelper(QByteArray const &posID, QString const &apak)
+  : m_posID(posID)
+  , m_posIDLength(m_posID.size())
+  , m_messageHeaderPrefix(1 + PACKET_ID_SIZE + 1, 0x00)
+  , m_rawPacket(IUC_ASYNCHPOS_MAX_TX_PACKET_SIZE, 0x00) {
+    m_messageHeaderPrefix[9] = (uint8_t)m_posID.size();
+
+    for (int p = 0; p < apak.size(); p+=2) {
+        uint8_t n = strtoul(apak.mid(p, 2).toStdString().c_str(), nullptr, 16);
+        m_apak.push_back(n);
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << apak << m_apak.toHex(':');
+        qCritical() << DBG_HEADER << m_posID.toHex(':');
+        qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+    }
+}
+
+MessageHelper::~MessageHelper() {
+
+}
+
+void MessageHelper::handleMessage(char const *pData) {
+
+#if 0
+    //unsigned char marker = pData[0];
+//	unsigned int tagNameLength = pData[1];
+    unsigned char tagName[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+//	unsigned int curElementLength = 0;
+    //unsigned char curElement[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+    //unsigned char receiptData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1];
+    unsigned char rxBuf[20];
+//	unsigned char flags[129];
+//	unsigned char docNr[32];
+    //unsigned char messageType = pData[1];
+
+    unsigned int uitmp = 0;
+    unsigned int uitmp2 = 0;
+
+    iuc_asynchpos_sub_initArray(tagName, IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE);
+    //iuc_asynchpos_sub_initArray(curElement, IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE);
+
+    uitmp = biox_FindStrInBufferInt("LoginResult",pData) | biox_FindStrInBuffer("LOGINRESULT",pData);
+    if (uitmp) {
+        asynchState = 0x02;	//eingeloggt
+        /*rxBuf[0] = 0x45;
+        rxBuf[1] = 0x00;
+        rxBuf[2] = 0x00;
+        vmc_SendWithBuffer(rxBuf,40,0x69,0);*/
+    }
+
+    uitmp = biox_FindStrInBufferInt("AuthorizationStarted",pData) | biox_FindStrInBuffer("AUTHORIZATIONSTARTED",pData);
+    if (uitmp) {
+        iuc_asynchpos_sub_initArray(rxBuf,5);
+        rxBuf[0] = 0x53;
+        rxBuf[1] = 0x00;
+        rxBuf[2] = 0x00;
+        vmc_SendWithBuffer(rxBuf,5,0x69,0);
+    }
+
+    uitmp = biox_FindStrInBufferInt("AuthorizationResult",pData) | biox_FindStrInBuffer("AUTHORIZATIONRESULT",pData);
+    if (uitmp) {
+        asynchState = 0x03; //successfully authorized
+        iuc_asynchpos_sub_clear_message(0x00);
+        uitmp = biox_FindStrInBufferInt("ID",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.id, 0, pData[uitmp + 1]);
+        uitmp = biox_FindStrInBufferInt("DocNr",pData) | biox_FindStrInBuffer("DOCNR",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.docNr, 0, pData[uitmp + 1]);
+        //uitmp = biox_FindStrInBuffer("Result",pData) | biox_FindStrInBuffer("RESULT",pData);
+        //biox_CopyBlock(pData, uitmp + 2, asynchBill.result, 0, pData[uitmp + 1]);
+
+        brd_SendDiagStr("->IUC ASYNCHPOS message ID: ",0);
+        brd_SendDiagBlock(asynchBill.id,1,36);
+
+        /*if (iuc_asynch_PrintControl) {
+            brd_SendDiagStr("->IUC ASYNCHPOS print data send AUTH: ",1);
+            vmc_SendWithBuffer(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE,0x69,0);
+            iuc_asynch_PrintControl = 0x00;
+            //biox_delay_ms(750);
+        }   else {
+            brd_SendDiagStr("->IUC ASYNCHPOS sending authorization: ",1);
+            iuc_asynch_PrintControl = 0x01;
+        }*/
+
+        uitmp = biox_FindStrInBufferInt("ERROR",pData);
+        if (!uitmp/*biox_FindStrInBuffer("OK",pData) | biox_FindStrInBuffer("Approved",pData) | biox_FindStrInBuffer("APPROVED",asynchBill.result)*/) {
+            iuc_asynch_PrintControl |= 0xF0;
+            /*uitmp = biox_FindStrInBufferInt("Amount",pData) | biox_FindStrInBufferInt("AMOUNT",pData);
+            //if (pData[uitmp + 1] <= 10) {
+                biox_CopyBlock(pData, uitmp + 2, asynchBill.amount, 0, pData[uitmp + 1]);
+            //} else {
+                //biox_CopyBlock(pData, uitmp + 2, asynchBill.amount, 0, 10);
+            //}*/
+
+            //uitmp = biox_FindStrInBuffer("Token",pData);
+            //biox_CopyBlock(pData, uitmp + 2, asynchBill.token, 0, pData[uitmp + 1]);
+            /*uitmp = biox_FindStrInBufferInt("Authcode",pData) | biox_FindStrInBufferInt("AUTHCODE",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.authCode, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("RRN",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.rrn, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("STAN",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.stan, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("CardType",pData) | biox_FindStrInBufferInt("CARDTYPE",pData);
+            biox_CopyBlock(pData, uitmp + 2, asynchBill.cardtype, 0, pData[uitmp + 1]);*/
+            asynchState = 0x04;
+
+            brd_SendDiagStr("->IUC ASYNCHPOS authorization confirmed.",1);
+
+            /*iuc_asynchpos_sub_initArray(rxBuf,20);
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0x00;
+            rxBuf[2] = 0x00;
+            vmc_SendWithBuffer(rxBuf,20,0x69,0);*/
+
+            //iuc_asynchpos_resetBuffers(0x01);
+            //iuc_asynchpos_command_close_Document();
+        } else {
+            iuc_asynch_PrintControl |= 0xF0;
+            //uitmp = biox_FindStrInBufferInt("ErrCode",pData) | biox_FindStrInBufferInt("ERRCODE",pData);
+            //biox_CopyBlock(pData, uitmp + 2, asynchBill.errCode, 0, pData[uitmp + 1]);
+
+            brd_SendDiagStr("->IUC ASYNCHPOS authorization failed.",1);
+
+            /*iuc_asynchpos_sub_initArray(rxBuf,20);
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0xFF;
+            biox_CopyBlock(pData, uitmp + 2, rxBuf, 2, pData[uitmp + 1]);
+            vmc_SendWithBuffer(rxBuf,20,0x69,0);*/
+            iuc_asynch_keepAlive = 0x00;
+            //VendRequest=0;
+        }
+    }
+
+    uitmp = biox_FindStrInBufferInt("PrintReceipt",pData) | biox_FindStrInBufferInt("PRINTRECEIPT",pData);
+    if (uitmp) {
+        asynchState = 0x03; //Customer receipt recieved
+        //iuc_asynchpos_sub_initArray(flags,129);
+        //uitmp = biox_FindStrInBufferInt("Flag",pData) | biox_FindStrInBufferInt("FLAG",pData) | biox_FindStrInBufferInt("Flags",pData) | biox_FindStrInBufferInt("FLAGS",pData);
+        /*if (uitmp) {
+            biox_CopyBlock(pData, uitmp + 2, flags, 0, pData[uitmp + 1]);
+            uitmp = biox_FindStrInBufferInt("CD",flags) | biox_FindStrInBufferInt("LR",flags);
+        }*/
+
+        /*iuc_asynchpos_sub_clear_message(0x00);
+        uitmp = biox_FindStrInBufferInt("ID",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.id, 0, pData[uitmp + 1]);
+        uitmp = biox_FindStrInBufferInt("DocNr",pData) | biox_FindStrInBuffer("DOCNR",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.docNr, 0, pData[uitmp + 1]);*/
+        iuc_asynchpos_sub_initArray(asynchBill.printId,129);
+        uitmp = biox_FindStrInBufferInt("ID",pData);
+        biox_CopyBlock(pData, uitmp + 2, asynchBill.printId, 0, pData[uitmp + 1]);
+
+        //if(asynchState == 0x02/* && uitmp biox_FindStrInBufferInt("CD",flags) || biox_FindStrInBufferInt("LR",flags)*/) {
+        if((!iuc_asynch_PRNrecieved) && (biox_FindStrInBufferInt("CD",pData) || biox_FindStrInBufferInt("LR",pData)) )	{
+            iuc_asynch_PRNrecieved = 0x01;
+            iuc_asynchpos_sub_initArray(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1);
+            uitmp = /*biox_FindStrInBuffer("ReceiptText",pData) | */biox_FindStrInBufferInt("RECEIPTTEXT",pData);
+            uitmp2 = (pData[uitmp] * 256) + pData[uitmp + 1];
+
+            //if (uitmp2 <= IUC_ASYNCHPOS_MAX_ARRAY_SIZE) {
+            if (uitmp2 > IUC_ASYNCHPOS_MAX_ARRAY_SIZE) {
+                uitmp2 = IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+                brd_SendDiagStr("->IUC ASYNCHPOS receipt: ERROR. Receipt too large! Cutting off.",1);
+                /*receiptData[0] = 0x50;
+                biox_CopyBlock(pData, uitmp + 2, receiptData, 1, uitmp2/*IUC_ASYNCHPOS_MAX_ARRAY_SIZE*);
+                //uitmp += IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+                //uitmp2 -= IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+
+                brd_SendDiagStr("->IUC ASYNCHPOS receipt: ",0);
+                brd_SendDiagBlock(receiptData,1,IUC_ASYNCHPOS_MAX_ARRAY_SIZE);
+                iuc_asynch_PrintControl |= 0x0F;*/
+
+                /*if (iuc_asynch_PrintControl) {
+                    brd_SendDiagStr("->IUC ASYNCHPOS print data send: ",1);
+                    vmc_SendWithBuffer(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE,0x69,0);
+                    iuc_asynch_PrintControl = 0x00;
+                } else {
+                    brd_SendDiagStr("->IUC ASYNCHPOS print data stored: ",1);
+                    iuc_asynch_PrintControl = 0x01;
+                }*/
+                //biox_delay_ms(750);
+
+                //iuc_asynchpos_resetBuffers(0x01);
+                //iuc_asynchpos_command_close_Document();
+
+                //iuc_asynchpos_resetBuffers(0x02);
+                //iuc_asynchpos_command_print_Result(0x01);
+            }
+
+            receiptData[0] = 0x50;
+            biox_CopyBlock(pData, uitmp + 2, receiptData, 1, uitmp2/*IUC_ASYNCHPOS_MAX_ARRAY_SIZE*/);
+
+            brd_SendDiagStr("->IUC ASYNCHPOS receipt: ",0);
+            brd_SendDiagBlock(receiptData,1,IUC_ASYNCHPOS_MAX_ARRAY_SIZE);
+            iuc_asynch_PrintControl |= 0x0F;
+
+            /* else {
+                //receiptData[0] = 0x50;
+                //iuc_asynchpos_sub_initZero(receiptData,1);
+                brd_SendDiagStr("->IUC ASYNCHPOS receipt: ERROR. Receipt too large!",1);
+                iuc_asynch_PrintControl |= 0x0E;
+            } */
+            /* else {
+                //iuc_asynchpos_resetBuffers(0x02);
+                iuc_asynchpos_command_print_Result(0x00);
+            }*/
+        }
+
+        //++iuc_print_counter;
+
+        //if(asynchState == 0x04 && iuc_asynch_PrintControl == 0) {
+            //iuc_asynchpos_resetBuffers(0x01);
+            //iuc_asynchpos_resetBuffers(0x00);
+            //iuc_asynchpos_command_print_Result(0x01);
+        /*} /else {
+            //iuc_asynchpos_resetBuffers(0x02);
+            iuc_asynchpos_command_print_Result(0x01);
+        }*/
+            //iuc_asynchpos_command_print_Result(0x01);
+
+        /*while (uitmp2 > IUC_ASYNCHPOS_MAX_ARRAY_SIZE) {
+            biox_CopyBlock(pData, uitmp + 2, receiptData, 0, IUC_ASYNCHPOS_MAX_ARRAY_SIZE);
+            uitmp += IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+            uitmp2 -= IUC_ASYNCHPOS_MAX_ARRAY_SIZE;
+            vmc_SendWithBuffer(receiptData,IUC_ASYNCHPOS_MAX_ARRAY_SIZE,0x69,0);
+        }
+
+        //Rest des Packets
+        biox_CopyBlock(pData, uitmp + 2, receiptData, 0, uitmp2);
+        vmc_SendWithBuffer(receiptData,uitmp2,0x69,0);
+
+        //iuc_asynchpos_resetBuffers(0x02);
+        iuc_asynchpos_command_print_Result(0x01);*/
+    }
+
+    uitmp = biox_FindStrInBufferInt("VoidResult",pData) | biox_FindStrInBufferInt("VOIDRESULT",pData);
+    if (uitmp) {
+        asynchState = 0x01; //There was a cancel. Relogin and try again.
+        uitmp = biox_FindStrInBufferInt("ERROR",pData);
+        if (uitmp) {
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0x56;
+            rxBuf[2] = 0x45;
+            vmc_SendWithBuffer(rxBuf,3,0x69,0);
+        }
+
+        uitmp = biox_FindStrInBufferInt("REFUND",pData);
+        if (uitmp) {
+            rxBuf[0] = 0x45;
+            rxBuf[1] = 0x56;
+            rxBuf[2] = 0x52;
+            vmc_SendWithBuffer(rxBuf,3,0x69,0);
+            //TODO refund bill here. Should not trigger, but it might.
+        }
+    }
+
+    uitmp = biox_FindStrInBufferInt("DocClosed",pData);
+    if (uitmp) {
+        asynchState = 0x01; //Transaction successful
+
+        //if (VendRequest)
+            GWstate.VendRequest=0;
+    }
+#endif
+}
+
+void MessageHelper::handleCommand(AsyncPosCommand command, char status) {
+    //r - registration, a - authorization, c - cancel, s - storno, k - kassenschnitt
+
+#if 0
+    UCHAR	tempBuf[3];
+    UCHAR	rxBuf[8];
+//	UINT	uitemp = 0;
+UINT uitmp= 700;
+
+    tempBuf[0] = 0x00;
+    tempBuf[1] = 0x00;
+    tempBuf[2] = 0x00;
+
+    timeHoldISMAS = GWglobTime.SecOfDay;
+
+    iuc_asynchpos_sub_initArray(rxBuf,8);
+    //iuc_asynchpos_resetBuffers(0x00);
+
+    switch (command) {
+        case 0x72:	//registration
+                    //iuc_asynchpos_init();
+                    asynchState = 0x01;
+                    iuc_asynchpos_command_Login();
+                    GWstate.VendRequest=1;
+                    break;
+        case 0x61:	//authorisation
+                    iuc_asynch_keepAlive = 0x01;
+                    iuc_asynch_PrintControl = 0;
+                    iuc_asynchpos_sub_clear_message(0x01);
+                    //VendRequest=1;
+                    iuc_asynchpos_resetBuffers(0x00);
+                    ///#ifdef IUC_ASYCHNPOS_TESTMODE
+                    //iuc_asynchpos_command_authorize(uitmp);
+                    //#else
+                    iuc_asynchpos_command_authorize(Vend.Amount);
+                    //#endif
+                    break;
+        case 0x63:	//cancel
+        case 0x73:	//storno
+                    /*if (asynchState <= 0x02 != 0) {	//Authorization result recieved?
+                        iuc_asynchpos_command_cancel_authorize();
+                    } else {*/
+                        iuc_asynchpos_command_close_Document(0x01);
+                    //}
+                    iuc_asynch_keepAlive = 0x00;
+                    //VendRequest=0;
+                    break;
+        case 0x6B:	//kassenschnitt
+                    iuc_asynchpos_command_Logout();
+                    break;
+        case 0x62:	//get last bill
+                    //iuc_zvt_getLastBill(tempBuf);
+                    break;
+        case 0x01:	iuc_asynchpos_command_close_Document(0x00);
+                    iuc_asynch_keepAlive = 0x00;
+                    //VendRequest=0;
+                    break;
+        case 0x70:	iuc_asynchpos_command_ping_terminal();
+                    break;
+        default:
+            break;
+    }
+#endif
+}
+
+void MessageHelper::createRawPacket(PacketType packetType,
+                                    QByteArray const &encryptedPacketID,
+                                    QByteArray const &message) {
+    if (createMessageHeaderPrefix(packetType, encryptedPacketID)) {
+        QByteArray ba(m_messageHeaderPrefix);
+        ba = ba.append(m_posID);
+        ba = ba.append(message);
+
+        uint16_t const size = ba.size();
+
+        ba.push_front((char)size);
+        ba.push_front((char)(size >> 8));
+
+        m_rawPacket = ba;
+    }
+}
+
+bool MessageHelper::setMessageHeaderPacketType(PacketType packetType) {
+
+    switch (packetType) {
+    case PacketType::POS_ECR:
+    case PacketType::MESSAGE_RECEIVED_POSITIVE_ACK:
+    case PacketType::MESSAGE_RECEIVED_NEGATIVE_ACK:
+        m_messageHeaderPrefix[0] = (uint8_t)packetType;
+        break;
+    default:
+        return false;
+    }
+    return true;
+}
+
+bool MessageHelper::createMessageHeaderPrefix(PacketType packetType, QByteArray const &encryptedPacketID) {
+    if (encryptedPacketID.size() == PACKET_ID_SIZE) {
+        if (setMessageHeaderPacketType(packetType)) {
+            for (int i = 1; i <= 8; ++i) {
+                m_messageHeaderPrefix[i] = (uint8_t)encryptedPacketID[i-1];
+            }
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+
+QByteArray const &MessageHelper::generateUniqueTransactionID(QString const &machineNr,
+                                                             QString const &customerNr) {
+
+    // TODO: wieder entfernen
+    QDateTime dt(QDateTime::fromString("2024-06-18T12:00:00", Qt::ISODate));
+
+    uint64_t const transID = MessageHelper::secsSinceJan2017(dt);
+
+    m_uniqueTransactionID.clear();
+    m_uniqueTransactionID = m_uniqueTransactionID.append(QByteArray(std::to_string(transID).c_str(), 9).rightJustified(10, '0'));
+    m_uniqueTransactionID = m_uniqueTransactionID.append(QByteArray(machineNr.toStdString().c_str()).rightJustified(5, '0'));
+    m_uniqueTransactionID = m_uniqueTransactionID.append(QByteArray(customerNr.toStdString().c_str()).rightJustified(4, '0'));
+
+    return m_uniqueTransactionID;
+}
+
+// actual payment. amount to pay is known.
+void MessageHelper::createAuthorizeMessage() {
+    m_authorizeMessage.clear();
+
+    m_authorizeMessage.push_back((char)0x89); // 9 in 0x89 is the size
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Authorize"));
+
+    QString const &price= m_price.setNum(1000);
+
+    m_authorizeMessage.push_back((char)0x06);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Amount"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)price.size());
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray(price.toStdString().c_str()));
+
+    m_authorizeMessage.push_back((char)0x04);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Cash"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x01);
+    m_authorizeMessage.push_back((char)0x30);
+
+    m_authorizeMessage.push_back((char)0x08);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Currency"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x03);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("978"));
+
+    m_authorizeMessage.push_back((char)0x05);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("DocNr"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x13);
+    m_authorizeMessage = m_authorizeMessage.append(generateUniqueTransactionID("1000", "100"));
+
+    m_authorizeMessage.push_back((char)0x04);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Time"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray(time));
+
+    m_authorizeMessage.push_back((char)0x04);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("Lang"));
+    m_authorizeMessage.push_back((char)0x00);
+    m_authorizeMessage.push_back((char)0x02);
+    m_authorizeMessage = m_authorizeMessage.append(QByteArray("lt"));
+
+    m_authorizeMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createCancelAuthorizeMessage() {
+    m_cancelAuthorizeMessage.clear();
+
+    m_cancelAuthorizeMessage.push_back((char)0x96); // 0x80 + 0x16
+    m_cancelAuthorizeMessage = m_cancelAuthorizeMessage.append(QByteArray("AuthorizationCancelled"));
+
+    m_cancelAuthorizeMessage.push_back((char)0x02);
+    m_cancelAuthorizeMessage = m_authorizeMessage.append(QByteArray("ID"));
+
+    m_cancelAuthorizeMessage.push_back((char)0x00);
+    m_cancelAuthorizeMessage.push_back((char)QByteArray(m_asyncBillData.id).size());
+    m_cancelAuthorizeMessage = m_cancelAuthorizeMessage.append(QByteArray(m_asyncBillData.id));
+
+    m_cancelAuthorizeMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createPingMessage() {
+    m_pingMessage.clear();
+
+    m_pingMessage.push_back((char)0x84); // 4 in 0x84 is the size
+    m_pingMessage = m_pingMessage.append(QByteArray("Ping"));
+
+    m_pingMessage.push_back((char)0x04);
+    m_pingMessage = m_authorizeMessage.append(QByteArray("Time"));
+    m_pingMessage.push_back((char)0x00);
+    m_pingMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_pingMessage = m_pingMessage.append(QByteArray(time));
+
+    m_pingMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createCloseDocumentMessage(bool storno) {
+    m_closeDocumentMessage.clear();
+
+    m_closeDocumentMessage.push_back((char)0x89); // 9 in 0x89 is the size
+    m_closeDocumentMessage = m_closeDocumentMessage.append(QByteArray("DocClosed"));
+
+    m_closeDocumentMessage.push_back((char)0x05);
+    m_closeDocumentMessage = m_closeDocumentMessage.append(QByteArray("DocNr"));
+
+    uint16_t const docNrSize = m_uniqueTransactionID.size();
+
+    m_closeDocumentMessage.push_back((char)(docNrSize >> 8));
+    m_closeDocumentMessage.push_back((char)(docNrSize));
+    m_closeDocumentMessage = m_closeDocumentMessage.append(m_uniqueTransactionID);
+
+    if (!storno) {
+        m_closeDocumentMessage.push_back((char)0x06);
+        m_closeDocumentMessage = m_closeDocumentMessage.append(QByteArray("AuthID"));
+
+        QByteArray ba(m_authorizationResult.m_id.toStdString().c_str());
+        uint16_t const authIdSize = ba.size();
+
+        m_closeDocumentMessage.push_back((char)(authIdSize >> 8));
+        m_closeDocumentMessage.push_back((char)(authIdSize));
+
+        m_closeDocumentMessage = m_closeDocumentMessage.append(ba);
+    }
+
+    m_closeDocumentMessage.push_back((char)0x00);
+}
+
+void MessageHelper::createPrintResultMessage() {
+    m_printResultMessage.clear();
+}
+
+uint32_t MessageHelper::secsSinceJan2017(QDateTime const &dt) {
+    return QDateTime(QDateTime::fromString("2017-01-01T00:00:00", Qt::ISODate)).secsTo(dt);
+}
+
+void MessageHelper::createLoginMessage() {
+    m_loginMessage.clear();
+
+    m_loginMessage.push_back((char)0x85); // 5 in 0x85 is the size
+    m_loginMessage = m_loginMessage.append(QByteArray("Login"));
+
+    m_loginMessage.push_back((char)0x04);
+    m_loginMessage = m_loginMessage.append(QByteArray("Time"));
+    m_loginMessage.push_back((char)0x00);
+    m_loginMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_loginMessage = m_loginMessage.append(time);
+
+    m_loginMessage.push_back((char)0x05);
+    m_loginMessage = m_loginMessage.append(QByteArray("Flags"));
+    m_loginMessage.push_back((char)0x00);
+    m_loginMessage.push_back((char)0x06);
+    m_loginMessage = m_loginMessage.append(QByteArray("AP3|LR"));
+
+    m_loginMessage.push_back((char)0x00);
+
+    if (DBG_LEVEL >= DBG_INFORMATION) {
+        qCritical() << DBG_HEADER << "loginMessage" << m_loginMessage.toHex(':');
+    }
+}
+
+void MessageHelper::createLogoutMessage() {
+    m_logoutMessage.clear();
+
+    m_logoutMessage.push_back((char)0x86); // 6 in 0x86 is the size
+    m_logoutMessage = m_loginMessage.append(QByteArray("Logout"));
+
+    m_loginMessage.push_back((char)0x04);
+    m_loginMessage = m_loginMessage.append(QByteArray("Time"));
+    m_loginMessage.push_back((char)0x00);
+    m_loginMessage.push_back((char)0x13);
+
+    QDateTime current = QDateTime::currentDateTime();
+    // TODO: wieder entfernen
+    current.setTime(QTime(12, 0, 0));
+    current.setDate(QDate(2024, 6, 18));
+
+    QByteArray time(current.toString(Qt::ISODate).toStdString().c_str());
+    time[10] = ' ';
+    m_logoutMessage = m_logoutMessage.append(time);
+
+    m_loginMessage.push_back((char)0x00);
+
+    if (DBG_LEVEL >= DBG_INFORMATION) {
+        qCritical() << DBG_HEADER << "loginMessage" << m_logoutMessage.toHex(':');
+    }
+}
+
+QByteArrayList const &MessageHelper::createMessageChunksToSend(AsyncPosCommand cmd, char etx) {
+    QByteArray encryptedPacketID(QByteArray("\x01\x02\x03\x04\x05\x06\x07\x08"));
+
+    m_messageChunkList.clear();
+
+    switch (cmd) {
+    case (int)MessageHelper::AsyncPosCommand::LOGIN:
+        createLoginMessage();
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_loginMessage);
+        break;
+    case (int)MessageHelper::AsyncPosCommand::LOGOUT:
+        createLogoutMessage();
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_logoutMessage);
+        break;
+    case (int)MessageHelper::AsyncPosCommand::AUTHORIZE:
+        createAuthorizeMessage();
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_authorizeMessage);
+        break;
+    case (int)MessageHelper::AsyncPosCommand::CLOSE_DOCUMENT:
+        createCloseDocumentMessage(); // actung: hier default parameter
+        createRawPacket(PacketType::POS_ECR, encryptedPacketID, m_closeDocumentMessage);
+        break;
+    default:;
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << m_rawPacket.toHex(':');
+    }
+
+    QByteArray const &ba = m_rawPacket.mid(11);
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << ba.toHex(':');
+    }
+
+    // calculate crc32 on message starting from (including) POSID length
+    uint32_t crc = TU::crc32(ba);
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "crc32" << hex << crc;
+    }
+
+    unsigned char cipherText[256];
+    memset(cipherText, 0, sizeof(cipherText));
+
+    // XOR crc32-value (4 bytes) with APAK starting from left
+    // (rest of APAK untouched)
+    QByteArray clearText(m_apak);
+    clearText[0] = clearText[0] ^ ((uint8_t)(crc >> 24));
+    clearText[1] = clearText[1] ^ ((uint8_t)(crc >> 16));
+    clearText[2] = clearText[2] ^ ((uint8_t)(crc >>  8));
+    clearText[3] = clearText[3] ^ ((uint8_t)(crc >>  0));
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "clearText" << clearText.toHex();
+    }
+
+    // encrypt XOR result with APAK using AES129, ECB mode
+    aes_encrypt((uint8_t *)clearText.data(),
+                (uint8_t *)cipherText,
+                (uint8_t *)m_apak.toStdString().c_str());
+
+    // 8 left bytes of encryption result is signature (Packet ID)
+    encryptedPacketID = QByteArray((const char *)cipherText, 8);
+
+    if (DBG_LEVEL >= DBG_INFORMATION) {
+        qCritical() << DBG_HEADER << "cipherText (new PacketID)" << encryptedPacketID.toHex(':');
+    }
+
+    // insert PacketID in packet
+    if (insertEncryptedPacketID(encryptedPacketID)) {
+
+        // build chunks to be sent over serial line
+
+        int const chunks = m_rawPacket.size() / IUC_ASYNCHPOS_MIN_PACKET_SIZE;
+
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << DBG_HEADER << "nr of chunks" << chunks;
+        }
+
+        int i = 0;
+        for (; i < chunks; ++i) {
+            QByteArray messageChunk = m_rawPacket.mid(IUC_ASYNCHPOS_MIN_PACKET_SIZE*i,
+                                                      IUC_ASYNCHPOS_MIN_PACKET_SIZE);
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "unmasked" << messageChunk.toHex(':');
+            }
+
+            messageChunk = MessageHelper::mask(messageChunk);
+
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "  masked" << messageChunk.toHex(':');
+            }
+
+            messageChunk.push_back(etx == ACK1 ? ETX2 : ETX1); // etx must be ACK1 or ACK2
+
+            char const lrc = TU::lrc(messageChunk);
+            messageChunk.push_back(lrc);
+            messageChunk.push_front(STX);
+
+            if (DBG_LEVEL >= DBG_INFORMATION) {
+                qCritical() << DBG_HEADER << "chunk to send" << messageChunk.toHex(':');
+            }
+
+            m_messageChunkList += messageChunk;
+        }
+
+        int const rest = m_rawPacket.size() % IUC_ASYNCHPOS_MIN_PACKET_SIZE;
+        if (rest) {
+            QByteArray messageChunk = m_rawPacket.mid(IUC_ASYNCHPOS_MIN_PACKET_SIZE*chunks, rest);
+
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "unmasked" << messageChunk.toHex(':');
+            }
+
+            messageChunk = mask(messageChunk);
+
+            if (DBG_LEVEL >= DBG_DEBUG) {
+                qCritical() << DBG_HEADER << i << "  masked" << messageChunk.toHex(':');
+            }
+
+            messageChunk.push_back(etx == ACK1 ? ETX2 : ETX1); // etx must be ACK1 or ACK2
+
+            char const lrc = TU::lrc(messageChunk);
+            messageChunk.push_back(lrc);
+            messageChunk.push_front(STX);
+
+
+            if (DBG_LEVEL >= DBG_INFORMATION) {
+                qCritical() << DBG_HEADER << "chunk to send" << messageChunk.toHex(':');
+            }
+
+            m_messageChunkList += messageChunk;
+        }
+    }
+
+    return m_messageChunkList;
+}
+
+QByteArrayList MessageHelper::createLoginMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::LOGIN, etx);
+}
+
+QByteArrayList MessageHelper::createLogoutMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::LOGOUT, etx);
+}
+
+QByteArrayList MessageHelper::createAuthorizeMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::AUTHORIZE, etx);
+}
+
+QByteArrayList MessageHelper::createCloseDocumentMessageChunksToSend(char etx) {
+    return createMessageChunksToSend(AsyncPosCommand::CLOSE_DOCUMENT, etx);
+}
+
+bool MessageHelper::insertEncryptedPacketID(QByteArray const &encryptedPacketID) {
+    if (encryptedPacketID.size() == PACKET_ID_SIZE) {
+        // m_rawPacket has already full length
+        for (int i = 0; i < PACKET_ID_SIZE; ++i) {
+            m_messageHeaderPrefix[i+1] = encryptedPacketID[i];
+            m_rawPacket[i+3] = encryptedPacketID[i];
+        }
+
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << DBG_HEADER << m_messageHeaderPrefix.toHex(':');
+            qCritical() << DBG_HEADER << m_rawPacket.toHex(':');
+        }
+
+        return true;
+    }
+    return false;
+}
+
+QByteArray const &MessageHelper::mask(QByteArray &messageChunk) {
+    QByteArray ba;
+    for (int i = 0; i < messageChunk.size(); ++i) {
+        char const c = messageChunk[i];
+        switch(c) {
+        case STX:   __attribute__((fallthrough));
+        case ETX1:  __attribute__((fallthrough));
+        case ETX2:  __attribute__((fallthrough));
+        case EOT:   __attribute__((fallthrough));
+        case ENQ:   __attribute__((fallthrough));
+        case ACK1:  __attribute__((fallthrough));
+        case ACK2:  __attribute__((fallthrough));
+        case DLE:   __attribute__((fallthrough));
+        case NAK:
+            ba.push_back(char(DLE));
+            ba.push_back(c + 0x30);
+        break;
+        default:
+            ba.push_back(c);
+        }
+    }
+
+    messageChunk = ba;
+    return messageChunk;
+}
+
+QByteArray const &MessageHelper::unMask(QByteArray &messageChunk) {
+    QByteArray ba;
+    for (int i = 0; i < messageChunk.size(); ++i) {
+        char c = messageChunk[i];
+        if (c == (char)0x10) /* DEL */ {
+            if ((i+1) < messageChunk.size()) {
+                c = messageChunk[i+1] - (char)0x30;
+            }
+        }
+        ba.push_back(c);
+    }
+    messageChunk = ba;
+    return messageChunk;
+}

main/MessageHelper.h

@@ -0,0 +1,112 @@
+#ifndef MESSAGE_HELPER_H_INCLUDED
+#define MESSAGE_HELPER_H_INCLUDED
+
+#include <cinttypes>
+#include <QByteArray>
+#include <QByteArrayList>
+#include <QString>
+#include <QDateTime>
+
+class MessageHelper {
+public:
+    enum PacketType : std::uint8_t {
+        POS_ECR = 0,
+        // POS_EXT = 1,
+        MESSAGE_RECEIVED_POSITIVE_ACK = 0x0A,
+        MESSAGE_RECEIVED_NEGATIVE_ACK = 0x0F
+        // POS_HOST_FORMAT_1_ENCRYPTED   = 0x11,
+        // POS_HOST_FORMAT_1_UNENCRYPTED = 0x21
+    };
+
+    enum AsyncPosCommand : std::uint8_t {
+        LOGIN  = 0,
+        LOGOUT = 1,
+        AUTHORIZE = 2,
+        CLOSE_DOCUMENT = 3
+    };
+
+    explicit MessageHelper(QString const &posID = "T-TPS-SELF2002in",
+                           QString const &apak = "8AC304380E0E476BA2558B75DB9E2516");
+    explicit MessageHelper(QByteArray const &posID, QString const &apak);
+    ~MessageHelper();
+
+
+    void createRawPacket(PacketType PacketType,
+                         QByteArray const &encryptedPacketId,
+                         QByteArray const &message);
+
+    bool insertEncryptedPacketID(QByteArray const &encryptedPacketID);
+
+    QByteArrayList createLoginMessageChunksToSend(char etx);
+    QByteArrayList createLogoutMessageChunksToSend(char etx);
+    QByteArrayList createAuthorizeMessageChunksToSend(char etx);
+    QByteArrayList createCloseDocumentMessageChunksToSend(char etx);
+    QByteArrayList const &createMessageChunksToSend(AsyncPosCommand cmd, char etx);
+
+// private:
+
+    QByteArray m_posID;
+    QByteArray m_apak;
+    uint8_t m_posIDLength;
+    QByteArray m_messageHeaderPrefix;
+    QByteArray m_rawPacket; // without leading STX and trailing [ETX(1/2), LRC]
+    QByteArray m_loginMessage;
+    QByteArray m_logoutMessage;
+    QByteArray m_authorizeMessage;
+    QByteArray m_cancelAuthorizeMessage;
+    QByteArray m_pingMessage;
+    QByteArray m_printResultMessage;
+    QByteArray m_closeDocumentMessage;
+    QByteArray m_uniqueTransactionID;
+    QString m_price;
+    QByteArrayList m_messageChunkList;
+
+    bool setMessageHeaderPacketType(PacketType packetType);
+
+    bool createMessageHeaderPrefix(PacketType packetType, QByteArray const &encryptedPacketID);
+    void createLoginMessage();
+    void createLogoutMessage();
+    void createAuthorizeMessage();
+    void createCancelAuthorizeMessage();
+    void createPingMessage();
+    void createCloseDocumentMessage(bool storno = false);
+    void createPrintResultMessage();
+
+    void handleCommand(AsyncPosCommand command, char status);
+    //r - registration, a - authorization, c - cancel, s - storno, k - kassenschnitt
+
+    void handleMessage(char const *pData);
+
+    QByteArray const &generateUniqueTransactionID(QString const &machineNr, QString const &customerNumer);
+
+    static QByteArray const &mask(QByteArray &messageChunk);
+    static QByteArray const &unMask(QByteArray &messageChunk);
+    static uint32_t secsSinceJan2017(QDateTime const &dt = QDateTime::currentDateTime());
+
+    struct AsynchBillData {
+        char time[20];
+        char id[37];
+        char printId[129];
+        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];
+        char errCode[17];
+        //unsigned char receiptData[IUC_ASYNCHPOS_RECEIPT_LENGTH];
+    };
+
+    struct AuthorizationResult {
+        QString m_id;       // max. 36
+        QString m_docNr;    // max. 32
+        QString m_result;   // "OK" or "ERROR"
+    };
+
+    static AsynchBillData m_asyncBillData;
+    static AuthorizationResult m_authorizationResult;
+};
+
+#endif // MESSAGE_HELPER_H_INCLUDED

main/aes128.cpp

@@ -0,0 +1,625 @@
+/*
+ * aes128.c
+ *
+ * Created: 27.11.2017 13:33:29
+ *  Author: Matthias
+ */ 
+
+#include <aes128.h>
+
+/* the expanded keySize */
+#define EXPANDED_KEY_SIZE 176
+//int expandedKeySize;
+
+/* the expanded key */
+//unsigned char expandedKey[EXPANDED_KEY_SIZE];
+
+/* the cipher key */
+//unsigned char key[16];
+
+/* the cipher key size */
+
+enum keySize{
+	SIZE_16 = 16,
+	SIZE_24 = 24,
+	SIZE_32 = 32
+};
+
+//enum keySize size;
+
+unsigned char sbox[256] =   {
+	//0     1    2      3     4    5     6     7      8    9     A      B    C     D     E     F
+	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, //0
+	0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, //1
+	0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, //2
+	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, //3
+	0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, //4
+	0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, //5
+	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, //6
+	0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, //7
+	0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, //8
+	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, //9
+	0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, //A
+	0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, //B
+	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, //C
+	0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, //D
+	0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, //E
+0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 }; //F
+
+unsigned char rsbox[256] =
+{ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb
+	, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb
+	, 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e
+	, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25
+	, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92
+	, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84
+	, 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06
+	, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b
+	, 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73
+	, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e
+	, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b
+	, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4
+	, 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f
+	, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef
+	, 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
+, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };
+
+unsigned char Rcon[256] = {
+
+	0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8,
+	0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3,
+	0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
+	0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d,
+	0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab,
+	0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
+	0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25,
+	0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01,
+	0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
+	0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa,
+	0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a,
+	0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
+	0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
+	0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef,
+	0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
+	0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04,
+	0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f,
+	0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
+	0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33,
+0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d};
+
+void aes_init() {
+	//UINT uitemp = 0;
+	/* the expanded keySize */
+	//expandedKeySize = EXPANDED_KEY_SIZE;
+
+	/* the cipher key */
+	//for (uitemp = 0; uitemp < 16; ++uitemp)
+		//key[uitemp] = 0x00;
+
+	/* the cipher key size */
+	//size = SIZE_16;
+}
+
+unsigned char getSBoxValue(unsigned char num)
+{
+	return sbox[num];
+}
+
+unsigned char getSBoxInvert(unsigned char num)
+{
+	return rsbox[num];
+}
+
+//Key generation
+
+/* Rijndael's key schedule rotate operation
+ * rotate the word eight bits to the left
+ *
+ * rotate(1d2c3a4f) = 2c3a4f1d
+ *
+ * word is an char array of size 4 (32 bit)
+ */
+void rotate(unsigned char *word)
+{
+    unsigned char c;
+    int i;
+
+    c = word[0];
+    for (i = 0; i < 3; i++)
+        word[i] = word[i+1];
+    word[3] = c;
+}
+
+unsigned char getRconValue(unsigned char num)
+{
+	return Rcon[num];
+}
+
+void core(unsigned char *word, int iteration)
+{
+	int i;
+
+	/* rotate the 32-bit word 8 bits to the left */
+	rotate(word);
+
+	/* apply S-Box substitution on all 4 parts of the 32-bit word */
+	for (i = 0; i < 4; ++i)
+	{
+		word[i] = getSBoxValue(word[i]);
+	}
+
+	/* XOR the output of the rcon operation with i to the first part (leftmost) only */
+	word[0] = word[0]^getRconValue(((unsigned char) iteration));
+}
+
+/* Rijndael's key expansion
+ * expands an 128,192,256 key into an 176,208,240 bytes key
+ *
+ * expandedKey is a pointer to an char array of large enough size
+ * key is a pointer to a non-expanded key
+ */
+
+void expandKey(unsigned char *expandedKey,
+               unsigned char *key,
+               enum keySize size,
+               /*size_t*/ unsigned int expandedKeySize)
+{
+    /* current expanded keySize, in bytes */
+    int currentSize = 0;
+    int rconIteration = 1;
+    int i;
+    unsigned char t[4] = {0,0,0,0};   // temporary 4-byte variable
+
+    /* set the 16,24,32 bytes of the expanded key to the input key */
+    for (i = 0; i < size; i++)
+        expandedKey[i] = key[i];
+    currentSize += size;
+
+    while (currentSize < expandedKeySize)
+    {
+        /* assign the previous 4 bytes to the temporary value t */
+        for (i = 0; i < 4; i++)
+        {
+            t[i] = expandedKey[(currentSize - 4) + i];
+        }
+
+        /* every 16,24,32 bytes we apply the core schedule to t
+         * and increment rconIteration afterwards
+         */
+        if(currentSize % size == 0)
+        {
+            core(t, rconIteration++);
+        }
+
+        /* For 256-bit keys, we add an extra sbox to the calculation */
+        if(size == SIZE_32 && ((currentSize % size) == 16)) {
+            for(i = 0; i < 4; i++)
+                t[i] = getSBoxValue(t[i]);
+        }
+
+        /* We XOR t with the four-byte block 16,24,32 bytes before the new expanded key.
+         * This becomes the next four bytes in the expanded key.
+         */
+        for(i = 0; i < 4; i++) {
+            expandedKey[currentSize] = expandedKey[currentSize - size] ^ t[i];
+            currentSize++;
+        }
+    }
+}
+
+//Encrypt
+
+void subBytes(unsigned char *state)
+{
+    int i;
+    /* substitute all the values from the state with the value in the SBox
+     * using the state value as index for the SBox
+     */
+    for (i = 0; i < 16; i++)
+        state[i] = getSBoxValue(state[i]);
+}
+
+void shiftRow(unsigned char *state, unsigned char nbr)
+{
+	int i, j;
+	unsigned char tmp;
+	/* each iteration shifts the row to the left by 1 */
+	for (i = 0; i < nbr; i++)
+	{
+		tmp = state[0];
+		for (j = 0; j < 3; j++)
+		state[j] = state[j+1];
+		state[3] = tmp;
+	}
+}
+
+void shiftRows(unsigned char *state)
+{
+	int i;
+	/* iterate over the 4 rows and call shiftRow() with that row */
+	for (i = 0; i < 4; i++)
+	shiftRow(state+i*4, i);
+}
+
+void addRoundKey(unsigned char *state, unsigned char *roundKey)
+{
+	int i;
+	for (i = 0; i < 16; i++)
+	state[i] = state[i] ^ roundKey[i] ;
+}
+
+unsigned char galois_multiplication(unsigned char a, unsigned char b)
+{
+	unsigned char p = 0;
+	unsigned char counter;
+	unsigned char hi_bit_set;
+	for(counter = 0; counter < 8; counter++) {
+		if((b & 1) == 1)
+			p ^= a;
+		hi_bit_set = (a & 0x80);
+		a <<= 1;
+		if(hi_bit_set == 0x80)
+			a ^= 0x1b;
+		b >>= 1;
+	}
+	return p;
+}
+
+void mixColumn(unsigned char *column)
+{
+	unsigned char cpy[4];
+	int i;
+	for(i = 0; i < 4; i++)
+	{
+		cpy[i] = column[i];
+	}
+	column[0] = galois_multiplication(cpy[0],2) ^
+	galois_multiplication(cpy[3],1) ^
+	galois_multiplication(cpy[2],1) ^
+	galois_multiplication(cpy[1],3);
+
+	column[1] = galois_multiplication(cpy[1],2) ^
+	galois_multiplication(cpy[0],1) ^
+	galois_multiplication(cpy[3],1) ^
+	galois_multiplication(cpy[2],3);
+
+	column[2] = galois_multiplication(cpy[2],2) ^
+	galois_multiplication(cpy[1],1) ^
+	galois_multiplication(cpy[0],1) ^
+	galois_multiplication(cpy[3],3);
+
+	column[3] = galois_multiplication(cpy[3],2) ^
+	galois_multiplication(cpy[2],1) ^
+	galois_multiplication(cpy[1],1) ^
+	galois_multiplication(cpy[0],3);
+}
+
+void mixColumns(unsigned char *state)
+{
+	int i, j;
+	unsigned char column[4];
+
+	/* iterate over the 4 columns */
+	for (i = 0; i < 4; i++)
+	{
+		/* construct one column by iterating over the 4 rows */
+		for (j = 0; j < 4; j++)
+		{
+			column[j] = state[(j*4)+i];
+		}
+
+		/* apply the mixColumn on one column */
+		mixColumn(column);
+
+		/* put the values back into the state */
+		for (j = 0; j < 4; j++)
+		{
+			state[(j*4)+i] = column[j];
+		}
+	}
+}
+
+void aes_round(unsigned char *state, unsigned char *roundKey)
+{
+	subBytes(state);
+	shiftRows(state);
+	mixColumns(state);
+	addRoundKey(state, roundKey);
+}
+
+void createRoundKey(unsigned char *expandedKey, unsigned char *roundKey)
+{
+	int i,j;
+	/* iterate over the columns */
+	for (i = 0; i < 4; i++)
+	{
+		/* iterate over the rows */
+		for (j = 0; j < 4; j++)
+		roundKey[(i+(j*4))] = expandedKey[(i*4)+j];
+	}
+}
+
+void aes_main(unsigned char *state, unsigned char *expandedKey, int nbrRounds)
+{
+	int i = 0;
+
+	unsigned char roundKey[16];
+
+	createRoundKey(expandedKey, roundKey);
+	addRoundKey(state, roundKey);
+
+	for (i = 1; i < nbrRounds; i++) {
+		createRoundKey(expandedKey + 16*i, roundKey);
+		aes_round(state, roundKey);
+	}
+
+	createRoundKey(expandedKey + 16*nbrRounds, roundKey);
+	subBytes(state);
+	shiftRows(state);
+	addRoundKey(state, roundKey);
+}
+
+char aes_encrypt(unsigned char *input,
+                 unsigned char *output,
+                 unsigned char *key
+                 /*, enum keySize size*/)
+{
+	enum keySize size = SIZE_16;
+    /* the expanded keySize */
+    int expandedKeySize;
+
+    /* the number of rounds */
+    int nbrRounds = 10;	//NOTE: modded
+
+    /* the expanded key */
+    //NOTE: modded: unsigned char *expandedKey = 0x00;
+	//unsigned char expandedKey[(16*(nbrRounds+1))];
+	unsigned char expandedKey[176];
+
+    /* the 128 bit block to encode */
+    unsigned char block[16];
+
+    int i,j;
+
+    /* set the number of rounds */
+    /*switch (size)
+    {
+        case SIZE_16:
+            nbrRounds = 10;
+            break;
+        case SIZE_24:
+            nbrRounds = 12;
+            break;
+        case SIZE_32:
+            nbrRounds = 14;
+            break;
+        default:
+            return 1; //UNKNOWN_KEYSIZE;
+            break;
+    }*/ //NOTE: modded
+
+    expandedKeySize = (16*(nbrRounds+1));
+    /*if ((expandedKey = malloc(expandedKeySize * sizeof(char))) == NULL)
+    {
+        return MEMORY_ALLOCATION_PROBLEM;
+    }*/
+
+    /* Set the block values, for the block:
+     * a0,0 a0,1 a0,2 a0,3
+     * a1,0 a1,1 a1,2 a1,3
+     * a2,0 a2,1 a2,2 a2,3
+     * a3,0 a3,1 a3,2 a3,3
+     * the mapping order is a0,0 a1,0 a2,0 a3,0 a0,1 a1,1 ... a2,3 a3,3
+     */
+
+    /* iterate over the columns */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            block[(i+(j*4))] = input[(i*4)+j];
+    }
+
+    /* expand the key into an 176, 208, 240 bytes key */
+    expandKey(expandedKey, key, size, expandedKeySize);
+
+    /* encrypt the block using the expandedKey */
+    aes_main(block, expandedKey, nbrRounds);
+
+    /* unmap the block again into the output */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            output[(i*4)+j] = block[(i+(j*4))];
+    }
+    return 0;
+}
+
+//Decrypt
+void invSubBytes(unsigned char *state)
+{
+    int i;
+    /* substitute all the values from the state with the value in the SBox
+     * using the state value as index for the SBox
+     */
+    for (i = 0; i < 16; i++)
+        state[i] = getSBoxInvert(state[i]);
+}
+
+void invShiftRow(unsigned char *state, unsigned char nbr)
+{
+	int i, j;
+	unsigned char tmp;
+	/* each iteration shifts the row to the right by 1 */
+	for (i = 0; i < nbr; i++)
+	{
+		tmp = state[3];
+		for (j = 3; j > 0; j--)
+		state[j] = state[j-1];
+		state[0] = tmp;
+	}
+}
+
+void invShiftRows(unsigned char *state)
+{
+    int i;
+    /* iterate over the 4 rows and call invShiftRow() with that row */
+    for (i = 0; i < 4; i++)
+        invShiftRow(state+i*4, i);
+}
+
+void invMixColumn(unsigned char *column)
+{
+	unsigned char cpy[4];
+	int i;
+	for(i = 0; i < 4; i++)
+	{
+		cpy[i] = column[i];
+	}
+	column[0] = galois_multiplication(cpy[0],14) ^
+	galois_multiplication(cpy[3],9) ^
+	galois_multiplication(cpy[2],13) ^
+	galois_multiplication(cpy[1],11);
+	column[1] = galois_multiplication(cpy[1],14) ^
+	galois_multiplication(cpy[0],9) ^
+	galois_multiplication(cpy[3],13) ^
+	galois_multiplication(cpy[2],11);
+	column[2] = galois_multiplication(cpy[2],14) ^
+	galois_multiplication(cpy[1],9) ^
+	galois_multiplication(cpy[0],13) ^
+	galois_multiplication(cpy[3],11);
+	column[3] = galois_multiplication(cpy[3],14) ^
+	galois_multiplication(cpy[2],9) ^
+	galois_multiplication(cpy[1],13) ^
+	galois_multiplication(cpy[0],11);
+}
+
+void invMixColumns(unsigned char *state)
+{
+	int i, j;
+	unsigned char column[4];
+
+	/* iterate over the 4 columns */
+	for (i = 0; i < 4; i++)
+	{
+		/* construct one column by iterating over the 4 rows */
+		for (j = 0; j < 4; j++)
+		{
+			column[j] = state[(j*4)+i];
+		}
+
+		/* apply the invMixColumn on one column */
+		invMixColumn(column);
+
+		/* put the values back into the state */
+		for (j = 0; j < 4; j++)
+		{
+			state[(j*4)+i] = column[j];
+		}
+	}
+}
+
+void aes_invRound(unsigned char *state, unsigned char *roundKey)
+{
+
+	invShiftRows(state);
+	invSubBytes(state);
+	addRoundKey(state, roundKey);
+	invMixColumns(state);
+}
+
+void aes_invMain(unsigned char *state, unsigned char *expandedKey, int nbrRounds)
+{
+	int i = 0;
+
+	unsigned char roundKey[16];
+
+	createRoundKey(expandedKey + 16*nbrRounds, roundKey);
+	addRoundKey(state, roundKey);
+
+	for (i = nbrRounds-1; i > 0; i--) {
+		createRoundKey(expandedKey + 16*i, roundKey);
+		aes_invRound(state, roundKey);
+	}
+
+	createRoundKey(expandedKey, roundKey);
+	invShiftRows(state);
+	invSubBytes(state);
+	addRoundKey(state, roundKey);
+}
+
+char aes_decrypt(unsigned char *input,
+                 unsigned char *output,
+                 unsigned char *key
+                 /*´, enum keySize size*/)
+{
+	enum keySize size = SIZE_16;
+    /* the expanded keySize */
+    int expandedKeySize;
+
+    /* the number of rounds */
+    int nbrRounds;
+
+    /* the expanded key */
+    unsigned char *expandedKey = 0x00;
+
+    /* the 128 bit block to decode */
+    unsigned char block[16];
+
+    int i,j;
+
+    /* set the number of rounds */
+    switch (size)
+    {
+        case SIZE_16:
+            nbrRounds = 10;
+            break;
+        case SIZE_24:
+            nbrRounds = 12;
+            break;
+        case SIZE_32:
+            nbrRounds = 14;
+            break;
+        default:
+            return 1; //UNKNOWN_KEYSIZE;
+            break;
+    }
+
+    expandedKeySize = (16*(nbrRounds+1));
+    /*if ((expandedKey = malloc(expandedKeySize * sizeof(char))) == NULL)
+    {
+        return MEMORY_ALLOCATION_PROBLEM;
+    }*/
+
+    /* Set the block values, for the block:
+     * a0,0 a0,1 a0,2 a0,3
+     * a1,0 a1,1 a1,2 a1,3
+     * a2,0 a2,1 a2,2 a2,3
+     * a3,0 a3,1 a3,2 a3,3
+     * the mapping order is a0,0 a1,0 a2,0 a3,0 a0,1 a1,1 ... a2,3 a3,3
+     */
+
+    /* iterate over the columns */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            block[(i+(j*4))] = input[(i*4)+j];
+    }
+
+    /* expand the key into an 176, 208, 240 bytes key */
+    expandKey(expandedKey, key, size, expandedKeySize);
+
+    /* decrypt the block using the expandedKey */
+    aes_invMain(block, expandedKey, nbrRounds);
+
+    /* unmap the block again into the output */
+    for (i = 0; i < 4; i++)
+    {
+        /* iterate over the rows */
+        for (j = 0; j < 4; j++)
+            output[(i*4)+j] = block[(i+(j*4))];
+    }
+    return 0;
+}

main/aes128.h

@@ -0,0 +1,8 @@
+#ifndef AES128_H
+#define AES128_H
+
+void aes_init();
+char aes_encrypt(unsigned char *input,unsigned char *output,unsigned char *key);
+char aes_decrypt(unsigned char *input,unsigned char *output,unsigned char *key);
+
+#endif

main/main.pro

@@ -27,11 +27,10 @@ CONFIG(debug, debug|release) {
 
 SOURCES += main.cpp
 
+# HEADERS +=
 
-# HEADERS += \
-
-# OTHER_FILES += \
-
+OTHER_FILES += \
+    /home/linux/customer_505/etc/psa_tariff/tariff01.json
 
 
 

main/terminal_utils.cpp

@@ -0,0 +1,96 @@
+#include "terminal_utils.h"
+
+#include <atomic>
+#include <cstring>
+#include <endian.h>
+#include <QString>
+#include <QByteArray>
+#include <QDebug>
+
+namespace TU {
+    char const *terminalStatus(uint8_t status) {
+        switch (status) {
+        case TERMINAL_CB2_KEYS_NOT_PRESENT:
+            return "CB2 KEYS NOT PRESENT";
+        case TERMINAL_NO_BANKING_PARAMETERS_PRESENT:
+            return "NO BANKING PARAMETERS PRESENT";
+        case TERMINAL_IS_BLOCKED:
+            return "TERMINAL IS BLOCKED";
+        case TERMINAL_NOT_OPERATIVE:
+            return "TERMINAL NOT OPERATIVE";
+        case TERMINAL_IS_READY_AND_ACTIVE:
+            return "TERMINAL IS READY AND ACTIVE";
+        case TERMINAL_IS_READY_AND_NOT_ACTIVE:
+            return "TERMINAL IS READY AND *NOT* ACTIVE";
+        case TERMINAL_LOG_FULL:
+            return "TERMINAL LOG IS FULL";
+        default:
+            return "";
+        }
+    }
+
+    QByteArray int2Hex(int i) {
+        return QByteArray::fromHex(
+                QString().setNum(i, 16).toLocal8Bit().constData()).toHex();
+    }
+
+    uint16_t getNextTransactionId() {
+        static std::atomic<int> i{0};
+        int j = 0;
+
+        while ((j = (++i % 100)) == 0); // 1 <= j <= 99
+
+        return htobe16(((j / 10) + 0x30) << 8) | ((j % 10) + 0x30);
+    }
+
+    uint32_t crc32(uint32_t crc, unsigned char* pData, size_t len) {
+
+        qCritical() << "updateCRC" << QByteArray((char *)pData, len).toHex();
+
+        int i = 0;
+        int j = 0;
+        unsigned char ucCarry = 0x00;
+
+        crc = ~crc;
+        while (len > 0) {
+            uint32_t const c = pData[i];
+            crc ^= c;
+            ++i;
+
+            for (j = 0; j < 8; ++j) {
+                ucCarry = crc & 1;
+                crc >>= 1;
+
+                if (ucCarry) {
+                    crc ^= 0xedb88320;
+                }
+            }
+            --len;
+        }
+
+        return ~crc;
+
+    }
+
+    uint32_t crc32(QByteArray const &ba) {
+        uint32_t crc = 0;
+        return crc32(crc, (uint8_t *)ba.data(), ba.size());
+    }
+
+    char lrc(QByteArray const &ba) {
+        char crc = 0;
+        for (int i = 0; i < ba.size(); ++i) {
+            crc ^= ba[i];
+        }
+        return crc;
+    }
+
+    bool isBigEndian() {
+        union {
+            uint32_t i;
+            char c[4];
+        } bint = {0x01020304};
+
+        return bint.c[0] == 1;
+    }
+}

main/terminal_utils.h

@@ -0,0 +1,31 @@
+#ifndef TERMINAL_UTILS_H_INCLUDED
+#define TERMINAL_UTILS_H_INCLUDED
+
+#include <cinttypes>
+#include <QByteArray>
+
+namespace TU {
+
+    enum STATUS : uint8_t {
+        TERMINAL_CB2_KEYS_NOT_PRESENT = 0x30,
+        TERMINAL_NO_BANKING_PARAMETERS_PRESENT = 0x31,
+        TERMINAL_IS_BLOCKED = 0x32,
+        TERMINAL_NOT_OPERATIVE = 0x33,
+        TERMINAL_IS_READY_AND_ACTIVE = 0x34,
+        TERMINAL_IS_READY_AND_NOT_ACTIVE = 0x35,
+        TERMINAL_LOG_FULL = 0x36
+    };
+
+    char const *terminalStatus(uint8_t status);
+    QByteArray int2Hex(int i);
+    uint16_t getNextTransactionId();
+
+    //uint32_t crc32(const char *s, size_t n);
+    //uint32_t crc32(QByteArray const &ba);
+    uint32_t crc32(QByteArray const &ba);
+    uint32_t crc32(uint32_t crc, unsigned char* pData, size_t len);
+
+    char lrc(QByteArray const &ba);
+    bool isBigEndian();
+}
+#endif // TERMINAL_UTILS_H_INCLUDED