From 175aa134ab482302dee96aa12c161e2d698aac18 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 6 May 2024 16:45:18 +0200 Subject: [PATCH] compare with tariff02, where we have used similiar stuff --- etc/psa_tariff/tariff07.json | 71 +++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/etc/psa_tariff/tariff07.json b/etc/psa_tariff/tariff07.json index 320e3a4..691a910 100644 --- a/etc/psa_tariff/tariff07.json +++ b/etc/psa_tariff/tariff07.json @@ -29,24 +29,83 @@ "pme_label": "steps" } ], + "TimeRange" : [ + { + "time_range_id": 1, + "time_range_from": "18:00:00", + "time_range_to": "08:00:00" + }, + { + "time_range_id": 2, + "time_range_from": "16:00:00", + "time_range_to": "18:00:00" + }, + { + "time_range_id": 3, + "time_range_from": "08:00:00", + "time_range_to": "18:00:00" + } + ], "PaymentOption": [ { "pop_id": 1049, "pop_label": "Zone 1", "pop_payment_method_id": 4, - "pop_day_end_time": "00:00:00", - "pop_day_night_end_time": "00:00:00", + "pop_day_end_time": "16:00:00", + "pop_day_night_end_time": "18:00:00", "pop_price_night": 0, "pop_min_time": 20, - "pop_max_time": 1440, + "pop_max_time": 120, "pop_min_date_time": "-w0dFriT16:00:00", "pop_max_date_time": "+w0dMonT00:00:00", "pop_min_price": 0, - "pop_max_price": 500, + "pop_max_price": 200, "pop_carry_over": 1, + "pop_carry_over_time_range": 1, + "pop_carry_over_start_time_range": 2, + "comment_1": "Fri can initiate a carry-over", + "pop_carry_over_end_time_range": 3, + "comment_2": "Sat can be target of a carry-over", + "pop_daily_card_price": 0, + "pop_business_hours": 135168, + "comment_1": "135168 = 0x21000 = 10|0001|0000|0000|0000 -> Fri with restricted hours" + }, + { + "pop_id": 1050, + "pop_label": "Zone 2", + "pop_payment_method_id": 4, + "pop_day_start_time": "08:00:00", + "pop_day_end_time": "18:00:00", + "pop_price_night": 0, + "pop_min_time": 20, + "pop_max_time": 1440, + "pop_max_price": 500, + "pop_min_price": 0, + "pop_carry_over": 1, + "pop_carry_over_time_range": 1, + "pop_carry_over_start_time_range": 3, + "comment_1": "Sat can initiate a carry-over", + "pop_carry_over_end_time_range": 3, + "comment_2": "Sun can be target of a carry-over", "pop_daily_card_price": 500, - "pop_business_hours": 159744, - "comment_1": "159744 = 0x27000 = 10|0111|0000|0000|0000 -> Fri-Sun with restricted hours" + "pop_business_hours": 139264, + "comment_1": "139264 = 0x22000 = 10|0010|0000|0000|0000 -> Sat with restricted hours" + }, + { + "pop_id": 1051, + "pop_label": "Zone 2", + "pop_payment_method_id": 4, + "pop_day_start_time": "08:00:00", + "pop_day_end_time": "18:00:00", + "pop_price_night": 0, + "pop_min_time": 20, + "pop_max_time": 600, + "pop_max_price": 500, + "pop_min_price": 0, + "pop_carry_over": 0, + "pop_daily_card_price": 500, + "pop_business_hours": 147456, + "comment_1": "147456 = 0x24000 = 10|0100|0000|0000|0000 -> Sun with restricted hours" } ], "PaymentRate": [