diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 9aff88e..c7fb06c 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -1045,6 +1045,12 @@ }, { "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, "prepaid_duration": 360, "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" @@ -1065,6 +1071,13 @@ { "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": 360, "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" @@ -1077,8 +1090,14 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 600, + "service_duration": 240, "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", "service_end": "18:00:00" } ] @@ -1187,6 +1206,12 @@ }, { "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, "prepaid_duration": 360, "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" @@ -1207,6 +1232,13 @@ { "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": 360, "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" @@ -1219,8 +1251,14 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 600, + "service_duration": 240, "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", "service_end": "18:00:00" } ] @@ -1329,6 +1367,12 @@ }, { "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, "prepaid_duration": 360, "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" @@ -1349,6 +1393,13 @@ { "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": 360, "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" @@ -1361,8 +1412,14 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 600, + "service_duration": 240, "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", "service_end": "18:00:00" } ] @@ -1471,6 +1528,12 @@ }, { "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, "prepaid_duration": 360, "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" @@ -1491,6 +1554,13 @@ { "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": 360, "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" @@ -1503,8 +1573,14 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 600, + "service_duration": 240, "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", "service_end": "18:00:00" } ] @@ -1574,6 +1650,12 @@ }, { "prepaid_id" : 2, + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, "prepaid_duration": 360, "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" @@ -1594,6 +1676,13 @@ { "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": 360, "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" @@ -1606,8 +1695,14 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 600, + "service_duration": 240, "service_start" : "08:00:00", + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", "service_end": "18:00:00" } ] diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index eedc1cd..8b50728 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -2245,8 +2245,14 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 360, + "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" } ] @@ -2265,8 +2271,15 @@ { "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" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 360, + "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" } ] @@ -2277,9 +2290,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 240, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", + "service_end": "18:00:00" } ] } @@ -2387,8 +2406,14 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 360, + "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" } ] @@ -2407,8 +2432,15 @@ { "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" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 360, + "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" } ] @@ -2419,9 +2451,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 240, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", + "service_end": "18:00:00" } ] } @@ -2529,8 +2567,14 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 360, + "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" } ] @@ -2549,8 +2593,15 @@ { "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" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 360, + "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" } ] @@ -2561,9 +2612,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 240, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", + "service_end": "18:00:00" } ] } @@ -2671,8 +2728,14 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 360, + "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" } ] @@ -2691,8 +2754,15 @@ { "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" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 360, + "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" } ] @@ -2703,9 +2773,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 240, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", + "service_end": "18:00:00" } ] } @@ -2774,8 +2850,14 @@ }, { "prepaid_id" : 2, - "prepaid_duration": 240, - "prepaid_start" : "20:00:00", + "prepaid_duration": 120, + "prepaid_start" : "12:00:00", + "prepaid_end": "14:00:00" + }, + { + "prepaid_id" : 3, + "prepaid_duration": 360, + "prepaid_start" : "18:00:00", "prepaid_end": "24:00:00" } ] @@ -2794,8 +2876,15 @@ { "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" : "12:00:00", + "carry_over_end": "14:00:00" + }, + { + "carry_over_id" : 3, + "carry_over_if": "always", + "carry_over_duration": 360, + "carry_over_start" : "18:00:00", "carry_over_end": "24:00:00" } ] @@ -2806,9 +2895,15 @@ "service_ranges" : [ { "service_id" : 1, - "service_duration": 720, + "service_duration": 240, "service_start" : "08:00:00", - "service_end": "20:00:00" + "service_end": "12:00:00" + }, + { + "service_id" : 2, + "service_duration": 240, + "service_start" : "14:00:00", + "service_end": "18:00:00" } ] }