X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c4731aeaa82ed94af67f4697abf58221a2f43adf..66c4165457f76e06ce6716a42dd4c8495af916db:/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index f2d70879..cdee5398 100644
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -166,16 +166,14 @@ try
         st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));
         st->Set(6, id);
         }
-    else
-        {
-        if (schemaVersion > 1)
+    else if (schemaVersion > 1)
             {
             st->Prepare("update tb_tariffs set \
                     fee = ?, \
                     free = ?, \
                     passive_cost = ?, \
                     traff_type = ?, \
-                    period = ? \
+                    period = ?, \
                     change_policy = ? \
                     where pk_tariff = ?");
             st->Set(1, td.tariffConf.fee);
@@ -186,20 +184,19 @@ try
             st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
             st->Set(7, id);
             }
-        else
-            {
-            st->Prepare("update tb_tariffs set \
-                    fee = ?, \
-                    free = ?, \
-                    passive_cost = ?, \
-                    traff_type = ? \
-                    where pk_tariff = ?");
-            st->Set(1, td.tariffConf.fee);
-            st->Set(2, td.tariffConf.free);
-            st->Set(3, td.tariffConf.passiveCost);
-            st->Set(4, td.tariffConf.traffType);
-            st->Set(5, id);
-            }
+    else
+        {
+        st->Prepare("update tb_tariffs set \
+                fee = ?, \
+                free = ?, \
+                passive_cost = ?, \
+                traff_type = ? \
+                where pk_tariff = ?");
+        st->Set(1, td.tariffConf.fee);
+        st->Set(2, td.tariffConf.free);
+        st->Set(3, td.tariffConf.passiveCost);
+        st->Set(4, td.tariffConf.traffType);
+        st->Set(5, id);
         }
     st->Execute();
     st->Close();
@@ -303,10 +300,11 @@ try
     st->Get(3, td->tariffConf.fee);
     st->Get(4, td->tariffConf.free);
     st->Get(5, td->tariffConf.passiveCost);
-    //st->Get(6, td->tariffConf.traffType);
     td->tariffConf.traffType = TARIFF::IntToTraffType(Get<int>(st, 6));
     if (schemaVersion > 0)
         td->tariffConf.period = TARIFF::StringToPeriod(Get<std::string>(st, 7));
+    if (schemaVersion > 1)
+        td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(Get<std::string>(st, 8));
     st->Close();
     st->Prepare("select * from tb_tariffs_params where fk_tariff = ?");
     st->Set(1, id);