From 3041174be77ae207f572928a010904948aa7048a Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 5 Jun 2025 13:13:55 +0200 Subject: [PATCH] fix tariff for zone6: no lunch break; 08:00 - 20:00 --- etc/psa_tariff/tariff06.json | 366 +++++++++-------------------------- 1 file changed, 92 insertions(+), 274 deletions(-) diff --git a/etc/psa_tariff/tariff06.json b/etc/psa_tariff/tariff06.json index b71cc14..edce5bc 100644 --- a/etc/psa_tariff/tariff06.json +++ b/etc/psa_tariff/tariff06.json @@ -1,7 +1,7 @@ { "Project" : "Kleipeda", - "Version" : "2.0.0-2025-04-23T09:32:12+02:00", - "Info" : "Yellow Zone (plus)", + "Version" : "1.0.0-2025-06-05T12:10:00+02:00", + "Info" : "Yellow Zone (Yello Parujis)", "Currency": [ { "pcu_id": 2, @@ -37,13 +37,13 @@ "TimeRange" : [ { "time_range_id": 1, - "time_range_from": "22:00:00", + "time_range_from": "20:00:00", "time_range_to": "08:00:00" }, { "time_range_id": 2, "time_range_from": "08:00:00", - "time_range_to": "22:00:00" + "time_range_to": "20:00:00" }, { "time_range_id": 3, @@ -58,10 +58,10 @@ "pop_payment_method_id": 5, "pop_min_time": 30, "comment_pop_min_time": "12mins -> 30 cent", - "pop_max_time": 840, - "comment_pop_max_time": "840mins = 14h -> 21 euros", + "pop_max_time": 720, + "comment_pop_max_time": "720mins = 12h x 0,6euros/h -> 7,20 euros", "pop_min_price": 30, - "pop_max_price": 840, + "pop_max_price": 720, "pop_plus_steps": 10, "pop_minus_steps": 1, "pop_time_step_config": 1, @@ -435,97 +435,47 @@ { "pra_payment_option_id": 1049, "pra_payment_unit_id": 72, - "pra_price": 720 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 73, - "pra_price": 730 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 74, - "pra_price": 740 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 75, - "pra_price": 750 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 76, - "pra_price": 760 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 77, - "pra_price": 770 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 78, - "pra_price": 780 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 79, - "pra_price": 790 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 80, - "pra_price": 800 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 81, - "pra_price": 810 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 82, - "pra_price": 820 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 83, - "pra_price": 830 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 84, - "pra_price": 0 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 85, - "pra_price": 0 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 86, - "pra_price": 0 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 87, - "pra_price": 0 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 88, - "pra_price": 0 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 89, - "pra_price": 0 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 90, - "pra_price": 840 + "pra_price": 720 } ], "Duration": [ @@ -890,50 +840,51 @@ "pun_label": "710 min" }, { - "pun_duration": 720, + "pun_duration": 710, "pun_id": 72, - "pun_label": "720 min" + "pun_label": "710 min" }, { - "pun_duration": 730, + "pun_duration": 710, "pun_id": 73, - "pun_label": "730 min" + "pun_label": "710 min" }, { - "pun_duration": 740, + "pun_duration": 710, "pun_id": 74, - "pun_label": "740 min" + "pun_label": "710 min" }, { "pun_duration": 750, "pun_id": 75, - "pun_label": "750 min" + "pun_label": "710 min" }, { - "pun_duration": 760, + "pun_duration": 710, "pun_id": 76, - "pun_label": "760 min" + "pun_label": "710 min" }, { - "pun_duration": 770, + "pun_duration": 710, "pun_id": 77, - "pun_label": "770 min" + "pun_label": "710 min" }, { - "pun_duration": 780, + "pun_duration": 710, "pun_id": 78, - "pun_label": "780 min" + "pun_label": "710 min" }, { - "pun_duration": 790, + "pun_duration": 710, "pun_id": 79, - "pun_label": "790 min" + "pun_label": "710 min" }, { - "pun_duration": 800, + "pun_duration": 720, "pun_id": 80, - "pun_label": "800 min" + "pun_label": "720 min" }, + { "pun_duration": 810, "pun_id": 81, @@ -990,8 +941,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1006,14 +957,8 @@ }, { "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1032,15 +977,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1051,21 +989,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] } ], "out_of_service_settings" : [ - ] + ] } }], "Tuesday" : [{ @@ -1073,8 +1005,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1089,14 +1021,8 @@ }, { "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1115,15 +1041,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1134,15 +1053,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] } @@ -1156,8 +1069,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1172,14 +1085,8 @@ }, { "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1198,15 +1105,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1217,21 +1117,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] } ], "out_of_service_settings" : [ - ] + ] } }], "Thursday" : [{ @@ -1239,8 +1133,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1255,14 +1149,8 @@ }, { "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1281,15 +1169,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1300,15 +1181,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] } @@ -1322,8 +1197,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1336,16 +1211,10 @@ "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1364,15 +1233,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1383,15 +1245,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] } @@ -1405,8 +1261,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1421,14 +1277,8 @@ }, { "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1447,15 +1297,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1466,15 +1309,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] } @@ -1488,8 +1325,8 @@ "payment_settings" : [ { "min_time" : 30, - "max_time" : 840, - "max_price": 840, + "max_time" : 720, + "max_price": 720, "min_price": 30 } ], @@ -1504,14 +1341,8 @@ }, { "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_duration": 240, + "prepaid_start" : "20:00:00", "prepaid_end": "24:00:00" } ] @@ -1530,15 +1361,8 @@ { "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_duration": 240, + "carry_over_start" : "20:00:00", "carry_over_end": "24:00:00" } ] @@ -1549,15 +1373,9 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 240, + "service_duration": 720, "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" + "service_end": "20:00:00" } ] }