From b97c064658d34bcd1ab4e4722b32ee02c8f33d6e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 29 Apr 2025 10:20:50 +0200 Subject: [PATCH] summer-tariffs (1st of May - 15th of Sep) for kleipeda --- etc/psa_tariff/tariff01.json | 102 +++--- etc/psa_tariff/tariff02.json | 566 +++++++++++------------------- etc/psa_tariff/tariff03.json | 657 ++++++++++------------------------- etc/psa_tariff/tariff04.json | 402 +++++---------------- etc/psa_tariff/tariff05.json | 90 ++--- 5 files changed, 565 insertions(+), 1252 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index faf1ab2..0023f8d 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -1,6 +1,6 @@ { "Project" : "Kleipeda", - "Version" : "2.1.0-2024-12-13T12:36:12+02:00", + "Version" : "2.1.0-2024-04-23T12:36:12+02:00", "Info" : "Red Zone (center)", "Currency": [ { @@ -37,13 +37,13 @@ "TimeRange" : [ { "time_range_id": 1, - "time_range_from": "20:00:00", + "time_range_from": "22:00:00", "time_range_to": "08:00:00" }, { "time_range_id": 2, "time_range_from": "08:00:00", - "time_range_to": "20:00:00" + "time_range_to": "22:00:00" }, { "time_range_id": 3, @@ -2212,8 +2212,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2239,8 +2239,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2257,9 +2257,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2295,8 +2295,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2322,8 +2322,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2340,9 +2340,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2378,8 +2378,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2405,8 +2405,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2423,9 +2423,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2459,8 +2459,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2486,8 +2486,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2504,9 +2504,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2542,8 +2542,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2569,8 +2569,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2587,9 +2587,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2625,8 +2625,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2652,8 +2652,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2670,9 +2670,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2708,8 +2708,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2735,8 +2735,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2753,9 +2753,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2791,8 +2791,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2818,8 +2818,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2836,9 +2836,9 @@ }, { "service_id" : 2, - "service_duration": 360, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index c7fb06c..1f2bfb5 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -1,6 +1,6 @@ { "Project" : "Kleipeda", - "Version" : "2.0.0-2024-10-01T09:32:12+02:00", + "Version" : "2.0.0-2025-04-23T09:32:12+02:00", "Info" : "Yellow Zone (plus)", "Currency": [ { @@ -37,13 +37,13 @@ "TimeRange" : [ { "time_range_id": 1, - "time_range_from": "18:00:00", + "time_range_from": "22:00:00", "time_range_to": "08:00:00" }, { "time_range_id": 2, "time_range_from": "08:00:00", - "time_range_to": "18:00:00" + "time_range_to": "22:00:00" }, { "time_range_id": 3, @@ -986,45 +986,6 @@ } ], "Monday" : [{ - "2025-04-21" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -1051,8 +1012,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -1078,8 +1039,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -1096,9 +1057,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -1108,46 +1069,7 @@ } }], "Tuesday" : [{ - "2024-12-24" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-03-11" : { + "2025-06-24" : { "payment_settings" : [ { "min_time" : 0, @@ -1212,8 +1134,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -1239,8 +1161,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -1257,9 +1179,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -1269,84 +1191,6 @@ } }], "Wednesday" : [{ - "2024-12-25" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-01-01" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -1373,8 +1217,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -1400,8 +1244,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -1418,9 +1262,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -1430,45 +1274,6 @@ } }], "Thursday" : [{ - "2024-12-26" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "2025-05-01" : { "payment_settings" : [ { @@ -1534,8 +1339,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -1561,8 +1366,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -1579,9 +1384,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -1591,7 +1396,7 @@ } }], "Friday" : [{ - "2024-11-01" : { + "2025-08-15" : { "payment_settings" : [ { "min_time" : 0, @@ -1656,8 +1461,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -1683,8 +1488,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -1701,64 +1506,25 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } ], "out_of_service_settings" : [ - ] + ] } }], "Saturday" : [{ - "2024-11-02" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 + "min_time" : 30, + "max_time" : 840, + "max_price": 840, + "min_price": 30 } ], "prepaid_settings" : [ @@ -1766,8 +1532,20 @@ "prepaid_ranges" : [ { "prepaid_id" : 1, - "prepaid_duration": 1440, + "prepaid_duration": 480, "prepaid_start" : "00:00:00", + "prepaid_end": "08:00:00" + }, + { + "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -1779,98 +1557,50 @@ { "carry_over_id" : 1, "carry_over_if": "always", - "carry_over_duration": 1440, + "carry_over_duration": 480, "carry_over_start" : "00:00:00", + "carry_over_end": "08:00:00" + }, + { + "carry_over_id" : 2, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] } ], "service_settings" : [ + { + "service_ranges" : [ + { + "service_id" : 1, + "service_duration": 240, + "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 480, + "service_start" : "14:00:00", + "service_end": "22:00:00" + } + ] + } ], "out_of_service_settings" : [ - ] + ] } }], "Sunday" : [{ - "2025-02-16" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-04-20" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "2025-05-04" : { "payment_settings" : [ { @@ -1908,9 +1638,9 @@ "service_settings" : [ ], "out_of_service_settings" : [ - ] + ] }, - "default" : { + "2025-06-01" : { "payment_settings" : [ { "min_time" : 0, @@ -1947,7 +1677,127 @@ "service_settings" : [ ], "out_of_service_settings" : [ - ] + ] + }, + "2025-07-06" : { + "payment_settings" : [ + { + "min_time" : 0, + "max_time" : 0, + "max_price": 0, + "min_price": 0 + } + ], + "prepaid_settings" : [ + { + "prepaid_ranges" : [ + { + "prepaid_id" : 1, + "prepaid_duration": 1440, + "prepaid_start" : "00:00:00", + "prepaid_end": "24:00:00" + } + ] + } + ], + "carry_over_settings" : [ + { + "carry_over_ranges" : [ + { + "carry_over_id" : 1, + "carry_over_if": "always", + "carry_over_duration": 1440, + "carry_over_start" : "00:00:00", + "carry_over_end": "24:00:00" + } + ] + } + ], + "service_settings" : [ + ], + "out_of_service_settings" : [ + ] + }, + "default" : { + "payment_settings" : [ + { + "min_time" : 30, + "max_time" : 840, + "max_price": 840, + "min_price": 30 + } + ], + "prepaid_settings" : [ + { + "prepaid_ranges" : [ + { + "prepaid_id" : 1, + "prepaid_duration": 480, + "prepaid_start" : "00:00:00", + "prepaid_end": "08:00:00" + }, + { + "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", + "prepaid_end": "24:00:00" + } + ] + } + ], + "carry_over_settings" : [ + { + "carry_over_ranges" : [ + { + "carry_over_id" : 1, + "carry_over_if": "always", + "carry_over_duration": 480, + "carry_over_start" : "00:00:00", + "carry_over_end": "08:00:00" + }, + { + "carry_over_id" : 2, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", + "carry_over_end": "24:00:00" + } + ] + } + ], + "service_settings" : [ + { + "service_ranges" : [ + { + "service_id" : 1, + "service_duration": 240, + "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 480, + "service_start" : "14:00:00", + "service_end": "22:00:00" + } + ] + } + ], + "out_of_service_settings" : [ + ] } }] } diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index 8b50728..dc2a517 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -1,6 +1,6 @@ { "Project" : "Kleipeda", - "Version" : "2.0.0-2024-10-01T09:32:12+02:00", + "Version" : "2.1.0-2025-04-23T12:36:12+02:00", "Info" : "Red Zone ()", "Currency": [ { @@ -37,13 +37,13 @@ "TimeRange" : [ { "time_range_id": 1, - "time_range_from": "20:00:00", + "time_range_from": "22:00:00", "time_range_to": "08:00:00" }, { "time_range_id": 2, "time_range_from": "08:00:00", - "time_range_to": "20:00:00" + "time_range_to": "22:00:00" }, { "time_range_id": 3, @@ -2186,45 +2186,6 @@ } ], "Monday" : [{ - "2025-04-21" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -2251,8 +2212,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2278,8 +2239,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2296,9 +2257,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -2308,84 +2269,6 @@ } }], "Tuesday" : [{ - "2024-12-24" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-03-11" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -2412,8 +2295,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2439,8 +2322,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2457,9 +2340,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -2469,52 +2352,13 @@ } }], "Wednesday" : [{ - "2024-12-25" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "2025-01-01" : { "payment_settings" : [ { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 + "min_time" : 12, + "max_time" : 840, + "max_price": 2100, + "min_price": 30 } ], "prepaid_settings" : [ @@ -2522,8 +2366,20 @@ "prepaid_ranges" : [ { "prepaid_id" : 1, - "prepaid_duration": 1440, + "prepaid_duration": 480, "prepaid_start" : "00:00:00", + "prepaid_end": "08:00:00" + }, + { + "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2535,14 +2391,44 @@ { "carry_over_id" : 1, "carry_over_if": "always", - "carry_over_duration": 1440, + "carry_over_duration": 480, "carry_over_start" : "00:00:00", + "carry_over_end": "08:00:00" + }, + { + "carry_over_id" : 2, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] } ], "service_settings" : [ + { + "service_ranges" : [ + { + "service_id" : 1, + "service_duration": 240, + "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 480, + "service_start" : "14:00:00", + "service_end": "22:00:00" + } + ] + } ], "out_of_service_settings" : [ ] @@ -2573,8 +2459,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2600,8 +2486,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2618,9 +2504,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -2630,84 +2516,6 @@ } }], "Thursday" : [{ - "2024-12-26" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-05-01" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -2734,8 +2542,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2761,8 +2569,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2779,9 +2587,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -2791,45 +2599,6 @@ } }], "Friday" : [{ - "2024-11-01" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -2856,8 +2625,8 @@ }, { "prepaid_id" : 3, - "prepaid_duration": 360, - "prepaid_start" : "18:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2883,8 +2652,8 @@ { "carry_over_id" : 3, "carry_over_if": "always", - "carry_over_duration": 360, - "carry_over_start" : "18:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2901,9 +2670,9 @@ }, { "service_id" : 2, - "service_duration": 240, + "service_duration": 480, "service_start" : "14:00:00", - "service_end": "18:00:00" + "service_end": "22:00:00" } ] } @@ -2913,52 +2682,13 @@ } }], "Saturday" : [{ - "2024-11-02" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 + "min_time" : 12, + "max_time" : 840, + "max_price": 2100, + "min_price": 30 } ], "prepaid_settings" : [ @@ -2966,8 +2696,20 @@ "prepaid_ranges" : [ { "prepaid_id" : 1, - "prepaid_duration": 1440, + "prepaid_duration": 480, "prepaid_start" : "00:00:00", + "prepaid_end": "08:00:00" + }, + { + "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2979,144 +2721,57 @@ { "carry_over_id" : 1, "carry_over_if": "always", - "carry_over_duration": 1440, + "carry_over_duration": 480, "carry_over_start" : "00:00:00", + "carry_over_end": "08:00:00" + }, + { + "carry_over_id" : 2, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] } ], "service_settings" : [ + { + "service_ranges" : [ + { + "service_id" : 1, + "service_duration": 240, + "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 480, + "service_start" : "14:00:00", + "service_end": "22:00:00" + } + ] + } ], "out_of_service_settings" : [ ] } }], "Sunday" : [{ - "2025-02-16" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-04-20" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-05-04" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 + "min_time" : 12, + "max_time" : 840, + "max_price": 2100, + "min_price": 30 } ], "prepaid_settings" : [ @@ -3124,8 +2779,20 @@ "prepaid_ranges" : [ { "prepaid_id" : 1, - "prepaid_duration": 1440, + "prepaid_duration": 480, "prepaid_start" : "00:00:00", + "prepaid_end": "08:00:00" + }, + { + "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -3137,14 +2804,44 @@ { "carry_over_id" : 1, "carry_over_if": "always", - "carry_over_duration": 1440, + "carry_over_duration": 480, "carry_over_start" : "00:00:00", + "carry_over_end": "08:00:00" + }, + { + "carry_over_id" : 2, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] } ], "service_settings" : [ + { + "service_ranges" : [ + { + "service_id" : 1, + "service_duration": 240, + "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 480, + "service_start" : "14:00:00", + "service_end": "22:00:00" + } + ] + } ], "out_of_service_settings" : [ ] diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index c29f61b..a5f007c 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,6 +1,6 @@ { "Project" : "Kleipeda", - "Version" : "2.0.0-2024-10-01T09:32:12+02:00", + "Version" : "2.0.0-2025-04-23T09:32:12+02:00", "Info" : "Yellow Zone (center)", "Currency": [ { @@ -986,45 +986,6 @@ } ], "Monday" : [{ - "2025-04-21" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -1085,50 +1046,11 @@ } ], "out_of_service_settings" : [ - ] + ] } }], "Tuesday" : [{ - "2024-12-24" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-03-11" : { + "2025-06-24" : { "payment_settings" : [ { "min_time" : 0, @@ -1227,88 +1149,10 @@ } ], "out_of_service_settings" : [ - ] + ] } }], "Wednesday" : [{ - "2024-12-25" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-01-01" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -1373,45 +1217,6 @@ } }], "Thursday" : [{ - "2024-12-26" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "2025-05-01" : { "payment_settings" : [ { @@ -1449,7 +1254,7 @@ "service_settings" : [ ], "out_of_service_settings" : [ - ] + ] }, "default" : { "payment_settings" : [ @@ -1515,7 +1320,7 @@ } }], "Friday" : [{ - "2024-11-01" : { + "2025-08-15" : { "payment_settings" : [ { "min_time" : 0, @@ -1618,45 +1423,6 @@ } }], "Saturday" : [{ - "2024-11-02" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "default" : { "payment_settings" : [ { @@ -1698,84 +1464,6 @@ } }], "Sunday" : [{ - "2025-02-16" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, - "2025-04-20" : { - "payment_settings" : [ - { - "min_time" : 0, - "max_time" : 0, - "max_price": 0, - "min_price": 0 - } - ], - "prepaid_settings" : [ - { - "prepaid_ranges" : [ - { - "prepaid_id" : 1, - "prepaid_duration": 1440, - "prepaid_start" : "00:00:00", - "prepaid_end": "24:00:00" - } - ] - } - ], - "carry_over_settings" : [ - { - "carry_over_ranges" : [ - { - "carry_over_id" : 1, - "carry_over_if": "always", - "carry_over_duration": 1440, - "carry_over_start" : "00:00:00", - "carry_over_end": "24:00:00" - } - ] - } - ], - "service_settings" : [ - ], - "out_of_service_settings" : [ - ] - }, "2025-05-04" : { "payment_settings" : [ { @@ -1815,6 +1503,84 @@ "out_of_service_settings" : [ ] }, + "2025-06-01" : { + "payment_settings" : [ + { + "min_time" : 0, + "max_time" : 0, + "max_price": 0, + "min_price": 0 + } + ], + "prepaid_settings" : [ + { + "prepaid_ranges" : [ + { + "prepaid_id" : 1, + "prepaid_duration": 1440, + "prepaid_start" : "00:00:00", + "prepaid_end": "24:00:00" + } + ] + } + ], + "carry_over_settings" : [ + { + "carry_over_ranges" : [ + { + "carry_over_id" : 1, + "carry_over_if": "always", + "carry_over_duration": 1440, + "carry_over_start" : "00:00:00", + "carry_over_end": "24:00:00" + } + ] + } + ], + "service_settings" : [ + ], + "out_of_service_settings" : [ + ] + }, + "2025-07-06" : { + "payment_settings" : [ + { + "min_time" : 0, + "max_time" : 0, + "max_price": 0, + "min_price": 0 + } + ], + "prepaid_settings" : [ + { + "prepaid_ranges" : [ + { + "prepaid_id" : 1, + "prepaid_duration": 1440, + "prepaid_start" : "00:00:00", + "prepaid_end": "24:00:00" + } + ] + } + ], + "carry_over_settings" : [ + { + "carry_over_ranges" : [ + { + "carry_over_id" : 1, + "carry_over_if": "always", + "carry_over_duration": 1440, + "carry_over_start" : "00:00:00", + "carry_over_end": "24:00:00" + } + ] + } + ], + "service_settings" : [ + ], + "out_of_service_settings" : [ + ] + }, "default" : { "payment_settings" : [ { diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json index 84d8116..ff11086 100644 --- a/etc/psa_tariff/tariff05.json +++ b/etc/psa_tariff/tariff05.json @@ -1,6 +1,6 @@ { "Project" : "Kleipeda", - "Version" : "2.1.0-2024-12-16T13:36:12+02:00", + "Version" : "2.1.0-2025-04-23T13:36:12+02:00", "Info" : "Red Zone (center)", "Currency": [ { @@ -37,13 +37,13 @@ "TimeRange" : [ { "time_range_id": 1, - "time_range_from": "20:00:00", + "time_range_from": "22:00:00", "time_range_to": "08:00:00" }, { "time_range_id": 2, "time_range_from": "08:00:00", - "time_range_to": "20:00:00" + "time_range_to": "22:00:00" }, { "time_range_id": 3, @@ -2206,8 +2206,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2226,8 +2226,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2238,9 +2238,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2270,8 +2270,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2290,8 +2290,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2302,9 +2302,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2334,8 +2334,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2354,8 +2354,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2366,9 +2366,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2398,8 +2398,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2418,8 +2418,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2430,9 +2430,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2462,8 +2462,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2482,8 +2482,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2494,9 +2494,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2526,8 +2526,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2546,8 +2546,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2558,9 +2558,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] } @@ -2590,8 +2590,8 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "22:00:00", "prepaid_end": "24:00:00" } ] @@ -2610,8 +2610,8 @@ { "carry_over_id" : 2, "carry_over_if": "always", - "carry_over_duration": 240, - "carry_over_start" : "20:00:00", + "carry_over_duration": 120, + "carry_over_start" : "22:00:00", "carry_over_end": "24:00:00" } ] @@ -2622,9 +2622,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 840, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "22:00:00" } ] }