} // namespace anonymous
-std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data)
+std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data, const std::string & /*encoding*/)
{
std::ostringstream stream;
-appendResetable(stream, "fee", data.tariffConf.fee);
-appendResetable(stream, "passiveCost", data.tariffConf.passiveCost);
-appendResetable(stream, "free", data.tariffConf.free);
+appendResetableTag(stream, "fee", data.tariffConf.fee);
+appendResetableTag(stream, "passiveCost", data.tariffConf.passiveCost);
+appendResetableTag(stream, "free", data.tariffConf.free);
if (!data.tariffConf.traffType.empty())
- switch (data.tariffConf.traffType.data())
+ stream << "<traffType value=\"" + TARIFF::TraffTypeToString(data.tariffConf.traffType.data()) + "\"/>";
+
+if (!data.tariffConf.period.empty())
+ switch (data.tariffConf.period.data())
{
- case TRAFF_UP: stream << "<traffType value=\"up\"/>"; break;
- case TRAFF_DOWN: stream << "<traffType value=\"down\"/>"; break;
- case TRAFF_UP_DOWN: stream << "<traffType value=\"up+down\"/>"; break;
- case TRAFF_MAX: stream << "<traffType value=\"max\"/>"; break;
+ case TARIFF::DAY: stream << "<period value=\"day\"/>"; break;
+ case TARIFF::MONTH: stream << "<period value=\"month\"/>"; break;
}
for (size_t i = 0; i < DIR_NUM; ++i)
appendSlashedResetable(stream, "priceNightB", data.dirPrice, &DIRPRICE_DATA_RES::priceNightB);
appendSlashedResetable(stream, "singlePrice", data.dirPrice, &DIRPRICE_DATA_RES::singlePrice);
appendSlashedResetable(stream, "noDiscount", data.dirPrice, &DIRPRICE_DATA_RES::noDiscount);
+appendSlashedResetable(stream, "threshold", data.dirPrice, &DIRPRICE_DATA_RES::threshold);
return stream.str();
}