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

Compare commits

base: GerhardHoffmann:0649057fd5fd6434515ba07edcf8bc9e2c77bce7
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone101
GerhardHoffmann:zg1/zone4
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone100
..
compare: GerhardHoffmann:a0f218400e52257a5743431e24747fa7761aabf1
Branches Tags
GerhardHoffmann:zg1/zone101
GerhardHoffmann:zg1/zone4
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone1
GerhardHoffmann:master
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone100

No commits in common. "0649057fd5fd6434515ba07edcf8bc9e2c77bce7" and "a0f218400e52257a5743431e24747fa7761aabf1" have entirely different histories.
0649057fd5 ... a0f218400e

2 changed files with 18 additions and 99 deletions
Show Stats Expand all files Collapse all files

4
etc/atbapp/text/HMI_Texte.xml
View File

@ -1000,14 +1000,14 @@
<en_GB>PLATE ENTRY\n(not required for display in the vehicle)</en_GB> <en_GB>PLATE ENTRY\n(not required for display in the vehicle)</en_GB>
<fr_FR>D'IDENTIFICATION\n(pas nécessaire de l'afficher dans le véhicule)</fr_FR> <fr_FR>D'IDENTIFICATION\n(pas nécessaire de l'afficher dans le véhicule)</fr_FR>
<nl_NL> </nl_NL> <nl_NL> </nl_NL>
<es_ES>ENTRADA DE PLACA\n(no necesaria para exhibir en el vehículo)</es_ES> <es_ES>ENTRADA DE PLACA (no necesaria para exhibir en el vehículo)</es_ES>
</Text> </Text>
<Text textnr="0x32"> <Text textnr="0x32">
<de_DE>PAPIERTICKET\n(zur Auslage im Fahrzeug)</de_DE> <de_DE>PAPIERTICKET\n(zur Auslage im Fahrzeug)</de_DE>
<en_GB>PAPER TICKET\n(for display in the vehicle)</en_GB> <en_GB>PAPER TICKET\n(for display in the vehicle)</en_GB>
<fr_FR>BILLET PAPIER\n(à présenter dans le véhicule)</fr_FR> <fr_FR>BILLET PAPIER\n(à présenter dans le véhicule)</fr_FR>
<nl_NL> </nl_NL> <nl_NL> </nl_NL>
<es_ES>BILLETE DE PAPEL\n(para exponer en el vehículo)</es_ES> <es_ES>BILLETE DE PAPEL (para exponer en el vehículo)</es_ES>
</Text> </Text>
<Text textnr="0x33"> <Text textnr="0x33">
<de_DE> </de_DE> <de_DE> </de_DE>

113
etc/psa_tariff/tariff03.json
View File

@ -58,10 +58,10 @@
"pop_payment_method_id": 5, "pop_payment_method_id": 5,
"pop_min_time": 60, "pop_min_time": 60,
"comment_pop_min_time": "60mins -> 200 cent", "comment_pop_min_time": "60mins -> 200 cent",
"pop_max_time": 14400, "pop_max_time": 1440,
"comment_pop_max_time": "1440mins = 24h -> 5 euros", "comment_pop_max_time": "1440mins = 24h -> 5 euros",
"pop_min_price": 200, "pop_min_price": 200,
"pop_max_price": 5000, "pop_max_price": 500,
"pop_plus_steps": 1, "pop_plus_steps": 1,
"pop_minus_steps": 1, "pop_minus_steps": 1,
"pop_time_step_config": 1, "pop_time_step_config": 1,
@ -86,51 +86,6 @@
"pra_payment_option_id": 1049, "pra_payment_option_id": 1049,
"pra_payment_unit_id": 2, "pra_payment_unit_id": 2,
"pra_price": 500 "pra_price": 500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 3,
"pra_price": 1000
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 4,
"pra_price": 1500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 5,
"pra_price": 2000
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 6,
"pra_price": 2500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 7,
"pra_price": 3000
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 8,
"pra_price": 3500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 9,
"pra_price": 4000
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 10,
"pra_price": 4500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 11,
"pra_price": 5000
} }
], ],
"Duration": [ "Duration": [
@ -145,42 +100,6 @@
{ {
"pun_duration": 1440, "pun_duration": 1440,
"pun_id": 2 "pun_id": 2
},
{
"pun_duration": 2880,
"pun_id": 3
},
{
"pun_duration": 4320,
"pun_id": 4
},
{
"pun_duration": 5760,
"pun_id": 5
},
{
"pun_duration": 7200,
"pun_id": 6
},
{
"pun_duration": 8640,
"pun_id": 7
},
{
"pun_duration": 10080,
"pun_id": 8
},
{
"pun_duration": 11520,
"pun_id": 9
},
{
"pun_duration": 12960,
"pun_id": 10
},
{
"pun_duration": 14400,
"pun_id": 11
} }
], ],
"Monday" : [{ "Monday" : [{
@ -188,8 +107,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],
@ -218,8 +137,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],
@ -248,8 +167,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],
@ -278,8 +197,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],
@ -308,8 +227,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],
@ -338,8 +257,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],
@ -368,8 +287,8 @@
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 60, "min_time" : 60,
"max_time" : 14400, "max_time" : 1440,
"max_price": 5000, "max_price": 500,
"min_price": 200 "min_price": 200
} }
], ],