X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/127981f11d5d3553925f01102f7c253e012829b5..7da963e5f936a329b63c308e4031b59390f42a92:/include/stg/tariff_conf.h?ds=sidebyside diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h index fc9807be..ae40c128 100644 --- a/include/stg/tariff_conf.h +++ b/include/stg/tariff_conf.h @@ -34,14 +34,6 @@ #include #include -//----------------------------------------------------------------------------- -enum -{ - TRAFF_UP = 0, - TRAFF_DOWN, - TRAFF_UP_DOWN, - TRAFF_MAX -}; //----------------------------------------------------------------------------- struct DIRPRICE_DATA { @@ -151,17 +143,17 @@ struct DIRPRICE_DATA_RES //----------------------------------------------------------------------------- struct TARIFF_CONF { - double fee; - double free; - int traffType; - double passiveCost; - std::string name; - TARIFF::PERIOD period; + double fee; + double free; + TARIFF::TRAFF_TYPE traffType; + double passiveCost; + std::string name; + TARIFF::PERIOD period; TARIFF_CONF() : fee(0), free(0), - traffType(TRAFF_UP_DOWN), + traffType(TARIFF::TRAFF_UP_DOWN), passiveCost(0), name(), period(TARIFF::MONTH) @@ -170,7 +162,7 @@ struct TARIFF_CONF TARIFF_CONF(const std::string & n) : fee(0), free(0), - traffType(TRAFF_UP_DOWN), + traffType(TARIFF::TRAFF_UP_DOWN), passiveCost(0), name(n), period(TARIFF::MONTH) @@ -211,12 +203,12 @@ struct TARIFF_CONF_RES return tc; } - RESETABLE fee; - RESETABLE free; - RESETABLE traffType; - RESETABLE passiveCost; - RESETABLE name; - RESETABLE period; + RESETABLE fee; + RESETABLE free; + RESETABLE traffType; + RESETABLE passiveCost; + RESETABLE name; + RESETABLE period; }; //----------------------------------------------------------------------------- struct TARIFF_DATA