]> git.stg.codes - stg.git/commitdiff
Ticket. The time_t currentTime parameter added in
authorElena Mamontova <helenh463@gmail.com>
Mon, 28 Nov 2016 13:31:52 +0000 (15:31 +0200)
committerElena Mamontova <helenh463@gmail.com>
Mon, 28 Nov 2016 13:31:52 +0000 (15:31 +0200)
TariffChangeIsAllow() function decfinition. The time_t timeout variable and
construction if ((currentTime > timeout) && (timeout != 0)) added in
TariffChangeIsAllowed().

projects/stargazer/tariff_impl.cpp

index a3084fbcd810c781fdd895be95c6148b797400f1..2daaeeb3756c6bc8f8e7da3dc19bf22a78444efa 100644 (file)
@@ -145,8 +145,11 @@ else
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
-std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to) const
+std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const
 {
 {
+time_t timeout = GetChangePolicyTimeout();
+if ((currentTime > timeout) && (timeout != 0))
+    return "";
 switch (GetChangePolicy())
     {
     case TARIFF::ALLOW:
 switch (GetChangePolicy())
     {
     case TARIFF::ALLOW: