From 3027ba38cbc80fc4493b4a6b01c9a938ecda31df Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 13 Sep 2024 10:22:09 +0200 Subject: [PATCH] First step for new tariffs: adapt carry-over-times --- etc/psa_tariff/tariff01.json | 2 +- etc/psa_tariff/tariff02.json | 70 ++++++++++++++++++++++++++-- etc/psa_tariff/tariff04.json | 88 ++++++++++++++++++++++++++++++------ 3 files changed, 140 insertions(+), 20 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index b61ea58..2ebbc9d 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -1,7 +1,7 @@ { "Project" : "Kleipeda", "Version" : "1.0.0-2024-08-01T09:32:12+02:00", - "Info" : "Red Zone", + "Info" : "Red Zone (center)", "Currency": [ { "pcu_id": 2, diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 7c47fe8..6ea270d 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -49,7 +49,7 @@ "PaymentOption": [ { "pop_id": 1049, - "pop_label": "Zone 1", + "pop_label": "Zone 2", "pop_payment_method_id": 4, "pop_day_end_time": "00:00:00", "pop_day_night_end_time": "00:00:00", @@ -656,14 +656,44 @@ { "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 } ], "Duration": [ { - "pun_duration": 0, - "pun_id": 0, - "pun_label": "0 min" + "pun_duration": 0, + "pun_id": 0, + "pun_label": "0 min" }, { "pun_duration": 10, @@ -1081,9 +1111,39 @@ "pun_label": "830 min" }, { - "pun_duration": 840, + "pun_duration": 830, "pun_id": 84, "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 85, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 86, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 87, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 88, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 89, + "pun_label": "840 min" + }, + { + "pun_duration": 840, + "pun_id": 90, + "pun_label": "840 min" } ], "WeekDaysWorktime": [ diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 1b9101e..96985e1 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,7 +1,7 @@ { "Project" : "Kleipeda", "Version" : "1.0.0-2024-08-01T09:32:12+02:00", - "Info" : "Yellow Zone", + "Info" : "Yellow Zone (center)", "Currency": [ { "pcu_id": 2, @@ -49,7 +49,7 @@ "PaymentOption": [ { "pop_id": 1049, - "pop_label": "Zone 1", + "pop_label": "Zone 2", "pop_payment_method_id": 4, "pop_day_end_time": "00:00:00", "pop_day_night_end_time": "00:00:00", @@ -90,7 +90,7 @@ "prepaid_id": 3, "prepaid_anytime": false, "prepaid_never": false, - "prepaid_static_start": "22:00:00", + "prepaid_static_start": "18:00:00", "prepaid_static_end": "08:00:00" } ], @@ -656,14 +656,44 @@ { "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 } ], "Duration": [ { - "pun_duration": 0, - "pun_id": 0, - "pun_label": "0 min" + "pun_duration": 0, + "pun_id": 0, + "pun_label": "0 min" }, { "pun_duration": 10, @@ -1081,9 +1111,39 @@ "pun_label": "830 min" }, { - "pun_duration": 840, + "pun_duration": 830, "pun_id": 84, "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 85, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 86, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 87, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 88, + "pun_label": "840 min" + }, + { + "pun_duration": 830, + "pun_id": 89, + "pun_label": "840 min" + }, + { + "pun_duration": 840, + "pun_id": 90, + "pun_label": "840 min" } ], "WeekDaysWorktime": [ @@ -1092,49 +1152,49 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 1, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" }, { "pwd_id": 622, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 2, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" }, { "pwd_id": 623, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 3, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" }, { "pwd_id": 624, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 4, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" }, { "pwd_id": 625, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" }, { "pwd_id": 626, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 6, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" }, { "pwd_id": 626, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 7, "pwd_time_from": "08:00:00", - "pwd_time_to": "22:00:00" + "pwd_time_to": "18:00:00" } ], "PeriodYear": [