library/include/mobilisis/day_of_week.h

@@ -2,12 +2,12 @@
 
 enum DayOfWeek
 {
-    Monday = 0x01,
+	Saturday = 0x06,
-    Tuesday = 0x02,
+	Sunday = 0x01,
-    Wednesday = 0x03,
+	Monday = 0x02,
-    Thursday = 0x04,
+	Tuesday = 0x02,
-    Friday = 0x05,
+	Wednesday = 0x03,
-    Saturday = 0x06,
+	Thursday = 0x04,
-    Sunday = 0x07,
+	Friday = 0x05,
-    UndefinedDay = 0xFF
+	UndefinedDay = 0xFF
 };

library/src/calculator_functions.cpp

@@ -201,9 +201,16 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
     if (price_per_unit < 0) price_per_unit = 1.0f;
 
-    // if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED";
+    if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED";
     LOG_DEBUG("Calculated price per minute: ", price_per_unit);
 
+    if (price_per_unit < 0)
+    {
+        inputDate = inputDate.addDays(1);
+        inputDate.setTime(worktime_from);
+        return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true);
+    }
+
     // If overtime flag is set
     if (overtime || nextDay)
     {
@@ -307,12 +314,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     //    }
 
     double ret_val = 0;
-    // double calc_price = (int)total_duration_min - (int)price / price_per_unit;
+    double calc_price = (int)total_duration_min - (int)price / price_per_unit;
 
-    //if (calc_price > 0 && total_duration_min > 0)
+    if (calc_price > 0 && total_duration_min > 0)
-    //{
+    {
-    //    inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
+        inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
-    //}
+    }
 
     if(price >= min_price && total_duration_min >= minMin)
         qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);