Ticket 37. In the ProcessNewMonth() function switch construction changed

[stg.git] / projects / stargazer / tariff_impl.cpp

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index bf272f3128a34f9939ba136fa29e68a95044964e..32a52d8f13df1a5c2ada0e79e37d64e5473f1434 100644 (file)
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -119,7 +119,7 @@ else
     }
 }
 //-----------------------------------------------------------------------------
-double TARIFF_IMPL::GetPriceWithoutFreeMb(int dir, int mb, time_t t) const
+double TARIFF_IMPL::GetPriceWithoutFreeMb(int dir, int64_t mb, time_t t) const
 {
 int interval = Interval(dir, t);
 
@@ -143,45 +143,34 @@ else if (!sp && th)
     return tariffData.dirPrice[dir].priceNightA;
 else
     return tariffData.dirPrice[dir].priceDayA;
-
-/*if (tariffData.dirPrice[dir].noDiscount && tariffData.dirPrice[dir].singlePrice)
-    {
-    return tariffData.dirPrice[dir].priceDayA;
-    }
-else
+}
+//-----------------------------------------------------------------------------
+std::string TARIFF_IMPL::TariffChangelsAllowed(const TARIFF & to) const
+{
+switch (GetChangePolicy())
     {
-    if (tariffData.dirPrice[dir].noDiscount)
+    case TARIFF::ALLOW:
         {
-        // Without threshold
-        if (interval == TARIFF_DAY)
-            return tariffData.dirPrice[dir].priceDayA;
-        else
-            return tariffData.dirPrice[dir].priceNightA;
+        return "";
         }
-
-    if (tariffData.dirPrice[dir].singlePrice)
+    case TARIFF::TO_CHEAP:
         {
-        // Without day/night
-        if (mb < tariffData.dirPrice[dir].threshold)
-            return tariffData.dirPrice[dir].priceDayA;
+        if (to.GetFee() < GetFee())
+            return "";
         else
-            return tariffData.dirPrice[dir].priceDayB;
+            return "Current tariff " + GetName() + " is more cheap than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()).c_str() + ".";
         }
-
-    if (mb < tariffData.dirPrice[dir].threshold)
+    case TARIFF::TO_EXPENSIVE:
         {
-        if (interval == TARIFF_DAY)
-            return tariffData.dirPrice[dir].priceDayA;
+        if (to.GetFee() > GetFee())
+            return "";
         else
-            return tariffData.dirPrice[dir].priceNightA;
+            return "Current tariff " + GetName() + " is more expensive than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()).c_str() + ".";
         }
-    else
+    case TARIFF::DENY:
         {
-        if (interval == TARIFF_DAY)
-            return tariffData.dirPrice[dir].priceDayB;
-        else
-            return tariffData.dirPrice[dir].priceNightB;
+        return "Current tariff " + GetName() + ", new tariff " + to.GetName() + ".";
         }
-    }*/
+    }
 }
 //-----------------------------------------------------------------------------