This branch is obsolete

Removed any special days.
Added tariff03.json for maybe zone_3 in Schoenau.

MOBILISIS-Calculator.pro

@@ -7,3 +7,7 @@ main.depends = library
 contains( CONFIG, PTU5_YOCTO ) {
     SUBDIRS = library
 }
+
+OTHER_FILES += \
+    tariffs/tariff01.json \
+    tariffs/tariff02.json

README

@@ -0,0 +1,3 @@
+This branch "schoenau" is obsolete!
+
+00332/Schoenau is allready included in current master branch.

library/include/mobilisis/atb_project.h

@@ -0,0 +1,13 @@
+#ifndef ATB_PROJECT_H_INCLUDED
+#define ATB_PROJECT_H_INCLUDED
+
+#include <QString>
+
+class ATBProject {
+  public:
+    QString project;
+    QString version;
+    QString info;
+};
+
+#endif // ATB_PROJECT_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -4,6 +4,9 @@
 #include <time.h>
 #include <inttypes.h>
 
+#include <QString>
+#include <QDateTime>
+
 #ifdef WIN32
 #ifdef CALCULATE_LIBRARY_EXPORTS
 #define CALCULATE_LIBRARY_API __declspec(dllexport)
@@ -18,9 +21,9 @@ class Configuration;
 
 typedef Configuration parking_tariff_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+//#ifdef __cplusplus
+//extern "C" {
+//#endif
 
 struct CALCULATE_LIBRARY_API price_t {
     uint32_t units;
@@ -30,16 +33,113 @@ struct CALCULATE_LIBRARY_API price_t {
     double vat;
 };
 
-bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file);
-void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
-int CALCULATE_LIBRARY_API get_zone_nr();
+struct CALCULATE_LIBRARY_API CalcState {
+    enum class State : uint8_t {
+        SUCCESS,
+        ERROR_PARSING_ZONE_NR,
+        ERROR_LOADING_TARIFF,
+        ERROR_PARSING_TARIFF,
+        NEGATIVE_PARING_TIME,
+        INVALID_START_DATE,
+        WRONG_PARAM_VALUES,
+        WRONG_ISO_TIME_FORMAT,
+        ABOVE_MAX_PARKING_TIME,
+        BELOW_MIN_PARKING_TIME,
+        BELOW_MIN_PARKING_PRICE,
+        OVERPAID
+    };
 
-bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(parking_tariff_t *tariff,
-                                      time_t start_parking_time,
-                                      time_t end_parking_time,
-                                      struct price_t *price);
-#ifdef __cplusplus
-} // extern "C"
-#endif
+    State m_status;
+    QString m_desc;
+
+    explicit CalcState() : m_status(State::SUCCESS), m_desc("") {}
+
+    explicit operator bool() const noexcept {
+        return (m_status == State::SUCCESS);
+    }
+
+    explicit operator QString () const noexcept {
+        QString s;
+        switch (m_status) {
+        case State::SUCCESS:
+            s = "SUCCESS";
+            break;
+        case State::ERROR_PARSING_ZONE_NR:
+            s = "ERROR_PARSING_ZONE_NR";
+            break;
+        case State::ERROR_LOADING_TARIFF:
+            s = "ERROR_LOADING_TARIFF";
+            break;
+        case State::ERROR_PARSING_TARIFF:
+            s = "ERROR_PARSING_TARIFF";
+            break;
+        case State::NEGATIVE_PARING_TIME:
+            s = "NEGATIVE_PARKING_TIME";
+            break;
+        case State::ABOVE_MAX_PARKING_TIME:
+            s = "ABOVE_MAX_PARKING_TIME";
+            break;
+        case State::WRONG_PARAM_VALUES:
+            s = "WRONG_PARAM_VALUES";
+            break;
+        case State::BELOW_MIN_PARKING_TIME:
+            s = "BELOW_MIN_PARKING_TIME";
+            break;
+        case State::BELOW_MIN_PARKING_PRICE:
+            s = "BELOW_MIN_PARKING_PRICE";
+            break;
+        case State::OVERPAID:
+            s = "OVERPAID";
+            break;
+        case State::INVALID_START_DATE:
+            s = "INVALID_START_DATE";
+            break;
+        case State::WRONG_ISO_TIME_FORMAT:
+            s = "WRONG_ISO_TIME_FORMAT";
+        }
+        return s + ":" + m_desc;
+    }
+
+    CalcState &set(State s) { m_status = s; return *this; }
+    CalcState &setDesc(QString s) { m_desc = s; return *this; }
+};
+
+CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
+                                            char const *config_file);
+void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
+int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
+                                            parking_tariff_t *tariff,
+                                            time_t start_parking_time,
+                                            time_t end_parking_time,
+                                            struct price_t *price);
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+                                            parking_tariff_t *tariff,
+                                            QDateTime const &start_parking_time,
+                                            int netto_parking_time,
+                                            QDateTime &end_parking_time,    // return value
+                                            struct price_t *price);         // return value
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
+                                            parking_tariff_t *tariff,
+                                            time_t start_parking_time,
+                                            double cost,
+                                            QString &duration);
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+                                            parking_tariff_t *tariff,
+                                            QDateTime const &start_parking_time,
+                                            double cost,
+                                            QDateTime &ticketEndTime);      // return value
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
+                                            parking_tariff_t *tariff,
+                                            QDateTime const &start_parking_time,
+                                            QDateTime &ticketEndTime);
+//#ifdef __cplusplus
+//} // extern "C"
+//#endif
 
 #endif // CALCULATE_PRICE_H

library/include/mobilisis/calculator_functions.h

@@ -1,7 +1,9 @@
 #pragma once
 #include <iostream>
 #include "configuration.h"
+#include "payment_method.h"
 
+#include <QDateTime>
 using namespace std;
 
 class Calculator
@@ -23,7 +25,24 @@ public:
 	/// <param name="tariff_cfg">Pointer to configuration</param>
 	/// <param name="vehicle_type">Type of vehicle</param>
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
+    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-	double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
+
+    // Introduced for Schoenau, Koenigsee.
+    // For tariff of following structure: only steps, no special days, nonstop.
+    uint32_t GetCostFromDuration(Configuration const* cfg, QDateTime const &start, quint64 durationMinutes, uint8_t paymentMethod = PaymentMethod::Steps);
+    uint32_t GetCostFromDuration(Configuration const* cfg, QDateTime const &start, QDateTime const &end, uint8_t paymentMethod = PaymentMethod::Steps);
+
+    // Daily ticket
+    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
+
+
+    //
+    // helper functions for Schoenau
+    //
+    QList<int> GetTimeSteps(Configuration const *cfg, int paymentMethod);
+    //
+    uint32_t GetPriceForTimeStep(Configuration const *cfg, uint8_t paymentMethod, int timeStep);
 };

library/include/mobilisis/configuration.h

@@ -20,6 +20,7 @@
 #include "member_type.h"
 #include "period_year.h"
 #include "payment_rate.h"
+#include "atb_project.h"
 
 using namespace std;
 using namespace rapidjson;
@@ -27,8 +28,8 @@ using namespace rapidjson;
 class Configuration
 {
 public:
-
-	ATBCurrency Currency;
+    ATBProject project;
+    ATBCurrency Currency;
 	ATBDuration duration;
 
 	multimap<int, ATBDuration> Duration;

library/include/mobilisis/day_of_week.h

@@ -2,12 +2,12 @@
 
 enum DayOfWeek
 {
-	Saturday = 0x06,
-	Sunday = 0x01,
-	Monday = 0x02,
-	Tuesday = 0x02,
-	Wednesday = 0x03,
-	Thursday = 0x04,
-	Friday = 0x05,
-	UndefinedDay = 0xFF
+    Monday = 0x01,
+    Tuesday = 0x02,
+    Wednesday = 0x03,
+    Thursday = 0x04,
+    Friday = 0x05,
+    Saturday = 0x06,
+    Sunday = 0x07,
+    UndefinedDay = 0xFF
 };

library/include/mobilisis/payment_opt.h

@@ -14,4 +14,5 @@ public:
 	double pop_max_time;
 	double pop_min_price;
 	int pop_carry_over;
+    int pop_daily_card_price;
 };

library/include/mobilisis/utilities.h

@@ -68,5 +68,6 @@ public:
 	/// </summary>
 	/// <param name="pra_price"></param>
 	/// <returns></returns>
-	static double CalculatePricePerUnit(double pra_price);
+    static double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
+
 };

library/library.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = mobilisis_calc
-# CONFIG += staticlib
+#CONFIG += staticlib
 
 QMAKE_CXXFLAGS += -std=c++17 -g -O0
 
@@ -65,7 +65,8 @@ HEADERS += \
     include/mobilisis/tariff_period_year.h \
     include/mobilisis/tariff_payment_rate.h \
     include/mobilisis/tariff_log.h \
-    include/mobilisis/calculate_price.h
+    include/mobilisis/calculate_price.h \
+    include/mobilisis/atb_project.h
 
 OTHER_FILES += src/main.cpp
 

library/src/calculate_price.cpp

@@ -10,25 +10,31 @@
 
 static Calculator calculator;
 
-int CALCULATE_LIBRARY_API get_zone_nr() {
-    QFile zone("/etc/zone_nr");
-    if (zone.exists()) {
-        QFileInfo finfo(zone);
-        if (finfo.size() <= 4) { // decimal 000\n
-            if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
-
-                QTextStream in(&zone);
-                return in.readLine(100).toInt();
-
+int CALCULATE_LIBRARY_API get_zone_nr(int zone)
+{
+    if(zone > -1) return zone;
+    else
+    {
+        QFile zone("/etc/zone_nr");
+        if (zone.exists()) {
+            QFileInfo finfo(zone);
+            if (finfo.size() <= 4) { // decimal 000\n
+                if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                    QTextStream in(&zone);
+                    return in.readLine(100).toInt();
+                }
             }
         }
+        return -1;
     }
-    return -1;
 }
 
-bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
+CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
     *tariff = new Configuration();
 
+    CalcState calcState;
+#if __linux__
+
     int const zone = get_zone_nr();
 
     // DEBUG
@@ -36,7 +42,9 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
     qCritical() << "      ... zone = " << zone;
 
     if (zone <= 0) {
-        return false;
+        delete *tariff;
+        *tariff = nullptr;
+        return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR);
     }
 
     QString confFile(config_file);
@@ -48,62 +56,252 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
     memset(buffer, 0x00, sizeof(buffer));
     snprintf(buffer, sizeof(buffer)-1, "tariff%02d.json", zone);
     confFile += buffer;
+#else // windows
+    QString confFile(config_file);
+#endif
 
     // DEBUG
     qCritical() << "      ... confFile = " << confFile;
 
     QFile fname(confFile);
-    if (fname.exists()) {
-
+    if (fname.exists() &&
+            fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
         // DEBUG
-        qCritical() << "      ... confFile exists";
+        qCritical() << "      ... confFile is open";
 
-        if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
-
-            // DEBUG
-            qCritical() << "      ... confFile is open";
-
-            QString json = fname.readAll();
-            return (*tariff)->ParseJson(*tariff, json.toStdString().c_str());
+        QString json = fname.readAll();
+        if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
+            delete *tariff;
+            *tariff = nullptr;
+            return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
         }
+    } else {
+        delete *tariff;
+        *tariff = nullptr;
+        return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
     }
 
-    qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!";
+    qCritical() << "init_tariff: Parsing tariff config (" << confFile << ")";
 
-    return false;
+    return calcState;
 }
 
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
-    delete tariff;
+    if (tariff != nullptr) {
+        delete tariff;
+    }
 }
 
-bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-                                      parking_tariff_t *tariff,
-                                      time_t start_parking_time, // in minutes
-                                      time_t end_parking_time,   // in minutes
-                                      struct price_t *price) {
+
+// this is currently not used
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+        parking_tariff_t *tariff,
+        time_t start_parking_time, // in minutes
+        time_t end_parking_time,   // netto time in minutes
+        struct price_t *price) {
+    CalcState calcState;
+    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+
+    if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
+        calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
+        return calcState.set(CalcState::State::WRONG_PARAM_VALUES);
+    }
+
     int const duration = end_parking_time - start_parking_time;
-    if (duration > 0) {
-        QDate const d(1970, 1, 1);
-        QTime const t(0, 0, 0);
-        QDateTime start(d, t, Qt::UTC);
-        start = start.toLocalTime().addSecs(start_parking_time * 60);
-        if (start.isValid()) {
-            QString cs = start.toString(Qt::ISODate);
-            double cost = calculator.GetCostFromDuration(
-                            tariff, PaymentOption::Option1,
-                            cs.toLocal8Bit().constData(),
-                            duration, false, true);
-            price->units = cost;
-            price->netto = cost;
-            return true;
-        }
-    } else
+    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);
+    }
+    if (duration > maxMin) {
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration).arg(maxMin));
+        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+    }
+    if (duration < minMin) {
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration).arg(minMin));
+        return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
+    }
     if (duration == 0) {
         memset(price, 0x00, sizeof(*price));
-        return true;
+        return calcState.set(CalcState::State::SUCCESS);
     }
-    qCritical() << "ERROR start_parking_time (" << start_parking_time << ") <"
-                << "end_parking_time (" << end_parking_time << ")";
-    return false;
+
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    QDateTime end(start);
+    if (start.isValid()) {
+        double cost = calculator.GetCostFromDuration(
+                    tariff, PaymentOption::Option1,
+                    start,
+                    end,
+                    duration, false, true);
+        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        if (cost < minCost) {
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
+            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
+        }
+        price->units = cost;
+        price->netto = cost;
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
 }
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+        parking_tariff_t *tariff,
+        QDateTime const &start_parking_time,
+        int netto_parking_time,
+        QDateTime &end_parking_time,
+        struct price_t *price)
+{
+    CalcState calcState;
+    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+
+    // DEBUG
+    qCritical() << "compute_price_for_parking_ticket() " << endl
+                << "          start_parking_time: " << start_parking_time << endl
+                << "          netto_parking_time: " << netto_parking_time << endl
+                << "                      minMin: " << minMin << endl
+                << "                      maxMin: " << maxMin;
+
+
+    if (netto_parking_time < 0) {
+        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);
+    }
+    if (netto_parking_time > maxMin) {
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
+        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+    }
+    if (netto_parking_time < minMin) {
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
+        return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
+    }
+    if (netto_parking_time == 0) {
+        memset(price, 0x00, sizeof(*price));
+        return calcState.set(CalcState::State::SUCCESS);
+    }
+
+    if (start_parking_time.isValid()) {
+        double cost = calculator.GetCostFromDuration(
+                        tariff, PaymentOption::Option1,
+                        start_parking_time,         // starting time
+                        end_parking_time,           // return value: end time
+                        netto_parking_time,         // minutes, netto
+                        false, true);
+        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        if (cost < minCost) {
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
+            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
+        }
+
+        // DEBUG
+        qCritical() << "               -> calculated cost (price->netto) =  " << cost;
+
+        price->units = cost;
+        price->netto = cost;
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+        parking_tariff_t *tariff,
+        time_t start_parking_time,
+        double price,
+        QString &duration) {
+    CalcState calcState;
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    if (start.isValid()) {
+        QString cs = start.toString(Qt::ISODate);
+
+        // DEBUG
+        qCritical() << "compute_duration_for_parking_ticket(): ";
+        qCritical() << "      start (cs): " << cs;
+        qCritical() << "           price: " << price;
+
+        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
+                                                  cs.toLocal8Bit().constData(),
+                                                  price, false, true).c_str();
+        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
+        if (!d.isValid()) {
+            calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
+            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+        }
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+        parking_tariff_t *tariff,
+        QDateTime const &start_parking_time,
+        double price,
+        QDateTime &ticketEndTime)
+{
+    CalcState calcState;
+    if (start_parking_time.isValid()) {
+        QString cs = start_parking_time.toString(Qt::ISODate);
+        QString endTime = calculator.GetDurationFromCost(
+                    tariff, PaymentOption::Option1,
+                    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 (!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);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
+{
+    CalcState calcState;
+    if (start_parking_time.isValid()) {
+
+        ticketEndTime = calculator.GetDailyTicketDuration(tariff,
+                                                            start_parking_time,
+                                                            PaymentOption::Option1,
+                                                            false);    // carry over
+
+        // DEBUG
+        qCritical() << "compute_duration_for_daily_ticket(): ";
+        qCritical() << "           ticketEndTime: " << ticketEndTime;
+
+        if (!ticketEndTime.isValid()) {
+            calcState.setDesc(QString("ticketEndTime=%1").arg(ticketEndTime.toString(Qt::ISODate)));
+            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+        }
+
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+

library/src/configuration.cpp

@@ -1,4 +1,5 @@
 #include "configuration.h"
+#include <QDebug>
 
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
@@ -33,8 +34,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		}
 
 		// Parse JSON to document
-		Document document;
-		document.Parse(json);
+        Document document;
+        document.Parse(json);
 
 		// Return if parse error has been found
 		ParseErrorCode err = document.GetParseError();
@@ -54,13 +55,13 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 
 		// 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"))
+         || !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;
@@ -87,13 +88,24 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
-            // if (!document[mb_name].IsArray()) {
-                std::string const _mb_name(mb_name);
-                if (_mb_name == "version" || _mb_name == "project" ||
-                    _mb_name == "zone" || _mb_name == "info") {
+            if (document[mb_name].IsString()) {
+                QString const _mb_name(mb_name);
+                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
+                    cfg->project.project = document[mb_name].GetString();
+                    qDebug() << "PROJECT" << cfg->project.project;
                     continue;
                 }
-            // }
+                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
+                    cfg->project.version = document[mb_name].GetString();
+                    qDebug() << "VERSION" << cfg->project.version;
+                    continue;
+                }
+                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
+                    cfg->project.info = document[mb_name].GetString();
+                    qDebug() << "INFO" << cfg->project.info;
+                    continue;
+                }
+            }
 
 			//printf(" -%s\n", mb_name);
 
@@ -154,6 +166,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
 						break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
@@ -209,7 +222,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
 					break;
 				case MemberType::PaymentRateType:
-					cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_unit_id, PaymentRate));
+                    cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
 					break;
 				case MemberType::PaymentOptionType:
 					cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));

library/src/utilities.cpp

@@ -8,12 +8,15 @@ static int protection_counter = 0;
 /// </summary>
 /// <param name="pra_price"></param>
 /// <returns></returns>
-double Utilities::CalculatePricePerUnit(double pra_price)
+double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
 {
 	try
 	{
 		double price_per_unit = pra_price;
-		price_per_unit /= 60.0f; // Divided by 60 because price per unit is set per hour and we are using minutes
+        double unit = durationUnit;
+
+        if(unit < 0 || unit > 65535 ) unit = 60.0f;
+        price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes
 		//printf("Price per unit (min) is: %lf\n", price_per_unit);
 		return price_per_unit;
 	}
@@ -33,7 +36,7 @@ time_t Utilities::GetCurrentLocalTime()
 		memset(&tm_curr_time, '\0', sizeof(struct tm));
 
 		tm_curr_time = *localtime(&curr_time);
-		curr_time = mktime(&tm_curr_time) - timezone;
+        curr_time = mktime(&tm_curr_time); //- timezone;
 		return curr_time;
 	}
 	catch (...)

main/main.pro

@@ -7,6 +7,8 @@ QMAKE_CFLAGS = -c -pipe -std=c11 -g -O0 -Wall -Wno-attributes -W -DDEBUG -D_REEN
 QMAKE_CXX_FLAGS += -std=c11
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/mobilisis/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/rapidjson/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/
 INCLUDEPATH += .
 
 unix {