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

118
etc/psa_tariff/tariff02_sommer.json
View File

@ -1514,17 +1514,17 @@
}
],
"out_of_service_settings" : [
]
]
}
}],
"Saturday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 840,
"max_price": 840,
"min_price": 30
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"prepaid_settings" : [
@ -1532,20 +1532,8 @@
"prepaid_ranges" : [
{
"prepaid_id" : 1,
"prepaid_duration": 480,
"prepaid_duration": 1440,
"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"
}
]
@ -1557,47 +1545,17 @@
{
"carry_over_id" : 1,
"carry_over_if": "always",
"carry_over_duration": 480,
"carry_over_duration": 1440,
"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"
}
]
}
],
"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" : [
]
]
}
}],
"Sunday" : [{
@ -1677,7 +1635,7 @@
"service_settings" : [
],
"out_of_service_settings" : [
]
]
},
"2025-07-06" : {
"payment_settings" : [
@ -1716,15 +1674,15 @@
"service_settings" : [
],
"out_of_service_settings" : [
]
]
},
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 840,
"max_price": 840,
"min_price": 30
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"prepaid_settings" : [
@ -1732,20 +1690,8 @@
"prepaid_ranges" : [
{
"prepaid_id" : 1,
"prepaid_duration": 480,
"prepaid_duration": 1440,
"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"
}
]
@ -1757,47 +1703,17 @@
{
"carry_over_id" : 1,
"carry_over_if": "always",
"carry_over_duration": 480,
"carry_over_duration": 1440,
"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"
}
]
}
],
"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" : [
]
]
}
}]
}

526
etc/psa_tariff/tariff04_sommer.json
View File

@ -986,71 +986,7 @@
}
],
"Monday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 840,
"max_price": 840,
"min_price": 30
}
],
"prepaid_settings" : [
{
"prepaid_ranges" : [
{
"prepaid_id" : 1,
"prepaid_duration": 480,
"prepaid_start" : "00:00:00",
"prepaid_end": "08:00:00"
},
{
"prepaid_id" : 2,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
}
],
"carry_over_settings" : [
{
"carry_over_ranges" : [
{
"carry_over_id" : 1,
"carry_over_if": "always",
"carry_over_duration": 480,
"carry_over_start" : "00:00:00",
"carry_over_end": "08:00:00"
},
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_start" : "08:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Tuesday" : [{
"2025-06-24" : {
"2025-04-21" : {
"payment_settings" : [
{
"min_time" : 0,
@ -1149,10 +1085,230 @@
}
],
"out_of_service_settings" : [
]
]
}
}],
"Tuesday" : [{
"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" : [
{
"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" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 840,
"max_price": 840,
"min_price": 30
}
],
"prepaid_settings" : [
{
"prepaid_ranges" : [
{
"prepaid_id" : 1,
"prepaid_duration": 480,
"prepaid_start" : "00:00:00",
"prepaid_end": "08:00:00"
},
{
"prepaid_id" : 2,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
}
],
"carry_over_settings" : [
{
"carry_over_ranges" : [
{
"carry_over_id" : 1,
"carry_over_if": "always",
"carry_over_duration": 480,
"carry_over_start" : "00:00:00",
"carry_over_end": "08:00:00"
},
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_start" : "08:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"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" : {
"payment_settings" : [
{
@ -1217,6 +1373,45 @@
}
}],
"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" : {
"payment_settings" : [
{
@ -1254,7 +1449,7 @@
"service_settings" : [
],
"out_of_service_settings" : [
]
]
},
"default" : {
"payment_settings" : [
@ -1320,7 +1515,7 @@
}
}],
"Friday" : [{
"2025-08-15" : {
"2024-11-01" : {
"payment_settings" : [
{
"min_time" : 0,
@ -1423,6 +1618,45 @@
}
}],
"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" : {
"payment_settings" : [
{
@ -1464,6 +1698,84 @@
}
}],
"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" : {
"payment_settings" : [
{
@ -1503,84 +1815,6 @@
"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" : {
"payment_settings" : [
{