GerhardHoffmann/customer_335
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: GerhardHoffmann:430d68b113a5ec6a643b9e25028ffc9f939ccae1
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone5
GerhardHoffmann:zg1/zone4
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone6
GerhardHoffmann:vorbereitung-sommer-tariffe
..
compare: GerhardHoffmann:d3d3fc769bb3a2762a265555628fde7d3a6f9bd3
Branches Tags
GerhardHoffmann:zg1/zone5
GerhardHoffmann:zg1/zone4
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone1
GerhardHoffmann:master
GerhardHoffmann:zg1/zone6
GerhardHoffmann:vorbereitung-sommer-tariffe

No commits in common. "430d68b113a5ec6a643b9e25028ffc9f939ccae1" and "d3d3fc769bb3a2762a265555628fde7d3a6f9bd3" have entirely different histories.
430d68b113 ... d3d3fc769b

2 changed files with 397 additions and 247 deletions
Show Stats Expand all files Collapse all files

108
etc/psa_tariff/tariff02_sommer.json
View File

@ -1521,10 +1521,10 @@
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 30, "min_time" : 0,
"max_time" : 840, "max_time" : 0,
"max_price": 840, "max_price": 0,
"min_price": 30 "min_price": 0
} }
], ],
"prepaid_settings" : [ "prepaid_settings" : [
@ -1532,20 +1532,8 @@
"prepaid_ranges" : [ "prepaid_ranges" : [
{ {
"prepaid_id" : 1, "prepaid_id" : 1,
"prepaid_duration": 480, "prepaid_duration": 1440,
"prepaid_start" : "00:00:00", "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" "prepaid_end": "24:00:00"
} }
] ]
@ -1557,44 +1545,14 @@
{ {
"carry_over_id" : 1, "carry_over_id" : 1,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 480, "carry_over_duration": 1440,
"carry_over_start" : "00:00:00", "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" "carry_over_end": "24:00:00"
} }
] ]
} }
], ],
"service_settings" : [ "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" : [ "out_of_service_settings" : [
] ]
@ -1721,10 +1679,10 @@
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 30, "min_time" : 0,
"max_time" : 840, "max_time" : 0,
"max_price": 840, "max_price": 0,
"min_price": 30 "min_price": 0
} }
], ],
"prepaid_settings" : [ "prepaid_settings" : [
@ -1732,20 +1690,8 @@
"prepaid_ranges" : [ "prepaid_ranges" : [
{ {
"prepaid_id" : 1, "prepaid_id" : 1,
"prepaid_duration": 480, "prepaid_duration": 1440,
"prepaid_start" : "00:00:00", "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" "prepaid_end": "24:00:00"
} }
] ]
@ -1757,44 +1703,14 @@
{ {
"carry_over_id" : 1, "carry_over_id" : 1,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 480, "carry_over_duration": 1440,
"carry_over_start" : "00:00:00", "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" "carry_over_end": "24:00:00"
} }
] ]
} }
], ],
"service_settings" : [ "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" : [ "out_of_service_settings" : [
] ]

394
etc/psa_tariff/tariff04_sommer.json
View File

@ -986,6 +986,45 @@
} }
], ],
"Monday" : [{ "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" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@ -1050,7 +1089,46 @@
} }
}], }],
"Tuesday" : [{ "Tuesday" : [{
"2025-06-24" : { "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" : [ "payment_settings" : [
{ {
"min_time" : 0, "min_time" : 0,
@ -1153,6 +1231,84 @@
} }
}], }],
"Wednesday" : [{ "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" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@ -1217,6 +1373,45 @@
} }
}], }],
"Thursday" : [{ "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" : { "2025-05-01" : {
"payment_settings" : [ "payment_settings" : [
{ {
@ -1320,7 +1515,7 @@
} }
}], }],
"Friday" : [{ "Friday" : [{
"2025-08-15" : { "2024-11-01" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 0, "min_time" : 0,
@ -1423,6 +1618,45 @@
} }
}], }],
"Saturday" : [{ "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" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@ -1464,6 +1698,84 @@
} }
}], }],
"Sunday" : [{ "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" : { "2025-05-04" : {
"payment_settings" : [ "payment_settings" : [
{ {
@ -1503,84 +1815,6 @@
"out_of_service_settings" : [ "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" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {