X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6c05b2e63b58b19df2f35707fa12f238a18458e7..3261ecc2503f45394eb3b9df97c36b08fb14fb1d:/stglibs/srvconf.lib/parsers/chg_tariff.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/parsers/chg_tariff.cpp b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
index c23cd0cd..158e6f89 100644
--- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
@@ -20,6 +20,8 @@
 
 #include "chg_tariff.h"
 
+#include "resetable_utils.h"
+
 #include "stg/tariff_conf.h"
 #include "stg/common.h"
 
@@ -32,13 +34,6 @@ using namespace STG;
 namespace
 {
 
-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << " value=\"" << value.data() << "\"/>";
-}
-
 template <typename A, typename T>
 void appendSlashedResetable(std::ostream & stream, const std::string & name, const A & array, T A::value_type:: * field)
 {
@@ -56,21 +51,22 @@ stream << "<" << name << " value=\"" << res << "\"/>";
 
 } // 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)
@@ -89,6 +85,7 @@ appendSlashedResetable(stream, "priceNightA", data.dirPrice, &DIRPRICE_DATA_RES:
 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();
 }