library/include/mobilisis/calculate_price.h

@@ -39,7 +39,6 @@ struct CALCULATE_LIBRARY_API CalcState {
         ERROR_LOADING_TARIFF,
         ERROR_PARSING_TARIFF,
         NEGATIVE_PARING_TIME,
-        INVALID_START_DATE,
         WRONG_PARAM_VALUES,
         ABOVE_MAX_PARKING_TIME,
         BELOW_MIN_PARKING_TIME,
@@ -89,9 +88,6 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::OVERPAID:
             s = "OVERPAID";
             break;
-        case State::INVALID_START_DATE:
-            s = "INVALID_START_DATE";
-            break;
         }
         return s + ":" + m_desc;
     }
@@ -105,17 +101,10 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr();
 
-CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-                                            parking_tariff_t *tariff,
+CalcState 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);
-
-CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
-                                            parking_tariff_t *tariff,
-                                            time_t start_parking_time,
-                                            double cost,
-                                            QString &duration);
 #ifdef __cplusplus
 } // extern "C"
 #endif

library/src/calculate_price.cpp

@@ -124,30 +124,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         }
         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);
-        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
-                                                  cs.toLocal8Bit().constData(),
-                                                  price, false, true).c_str();
-    } else {
-        return calcState.set(CalcState::State::INVALID_START_DATE);
     }
 
     return calcState.set(CalcState::State::SUCCESS);

library/src/calculator_functions.cpp

@@ -509,6 +509,5 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
 
 	double ret_val = total_cost;
 	total_cost = 0.0f;
-    // return ceil(ret_val);
-    return floor(ret_val);
+	return floor(ret_val);
 }