Merge branch 'moransBranch'

2023-06-14 11:28:27 +02:00
parent 268d43cdea 9d64350e4f
commit cb8cd5dead
10 changed files with 1641 additions and 952 deletions
--- a/library/include/mobilisis/day_of_week.h
+++ b/library/include/mobilisis/day_of_week.h
@@ -2,12 +2,12 @@

 enum DayOfWeek
 {
-	Saturday = 0x06,
-	Sunday = 0x01,
-	Monday = 0x02,
-	Tuesday = 0x02,
-	Wednesday = 0x03,
-	Thursday = 0x04,
-	Friday = 0x05,
-	UndefinedDay = 0xFF
-};
+    Monday = 0x01,
+    Tuesday = 0x02,
+    Wednesday = 0x03,
+    Thursday = 0x04,
+    Friday = 0x05,
+    Saturday = 0x06,
+    Sunday = 0x07,
+    UndefinedDay = 0xFF
+};
--- a/library/include/mobilisis/utilities.h
+++ b/library/include/mobilisis/utilities.h
@@ -68,6 +68,6 @@ public:
 	/// </summary>
 	/// <param name="pra_price"></param>
 	/// <returns></returns>
-	static double CalculatePricePerUnit(double pra_price);
+    static double CalculatePricePerUnit(double pra_price, double durationUnit = -1);

 };