diff --git a/library/include/mobilisis/calculate_price.h b/library/include/mobilisis/calculate_price.h index e9ecd19..7bbdfef 100644 --- a/library/include/mobilisis/calculate_price.h +++ b/library/include/mobilisis/calculate_price.h @@ -18,6 +18,8 @@ #define CALCULATE_LIBRARY_API #endif +#include "tariff_permit_type.h" + class Configuration; typedef Configuration parking_tariff_t; @@ -39,17 +41,6 @@ struct CALCULATE_LIBRARY_API price_t { } }; -enum class PERMIT_TYPE : quint8 { - SHORT_TERM_PARKING, - DAY_TICKET, - SZEGED_START, - SZEGED_STOP, - DAY_TICKET_ADULT, - DAY_TICKET_TEEN, - DAY_TICKET_CHILD, - INVALID -}; - struct CALCULATE_LIBRARY_API CalcState { enum class State : uint8_t { SUCCESS, @@ -161,7 +152,7 @@ QList CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg); int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING); int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING); int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING); -int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING); +int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING); CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket( // deprecated parking_tariff_t *tariff,