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

Compare commits

base: GerhardHoffmann:a0c9ec223a944f44e1458385fe94a5ad5af84fee
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone2
..
compare: GerhardHoffmann:fa71def31a6025f518ce0ccca74fb154563d8d9a
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone2

3 Commits
a0c9ec223a ... fa71def31a

Author SHA1 Message Date
Gerhard Hoffmann
fa71def31a Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_743 into zg1/zone1 2024-11-04 10:09:56 +01:00
Gerhard Hoffmann
c0abeb7989 Add tariff-file with new format, but functional same as tariff01 2024-11-04 10:09:21 +01:00
Siegfried Siegert
547331592e
APP states: Coin-input: wait for CASH_INPUT_FINISHED 2024-11-04 08:52:31 +01:00
2 changed files with 728 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
etc/atbapp/states/APP_States_743_Kirchdorf.xml
View File

@ -78,16 +78,16 @@
</APP_STATE>
<APP_STATE name="CASH_PAYMENT_INPUT">
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
<!-- AUTO-TICKET on PayUp: change to new state -->
<EVENT name="RECEIVED_CALCULATE_TIME_OVERPAID" task="PAYMENT_ACCEPTED" resultingState="CASH_OVERPAYED_ASK"/>
<EVENT name="RECEIVED_CALCULATE_TIME_MAX" task="PAYMENT_ACCEPTED" resultingState="PRINT_TICKET_CASH"/>
<!-- AUTO-TICKET on PayUp: accept payment -->
<EVENT name="RECEIVED_CALCULATE_TIME_OVERPAID" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CALCULATE_TIME_MAX" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_OVERPAYED_ASK"/>
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
<EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
</APP_STATE>
</APP_STATE>
<APP_STATE name="CASH_PAYMENT_ERROR">
<ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
<ENTRY_TASK name="CASH_ABORT"/>

724
etc/psa_tariff/tariff02.json Normal file
View File

@ -0,0 +1,724 @@
{
"Project" : "Neuhauser Kirchdorf",
"Version" : "1.1.0-2024-10-31T09:00:00+02:00",
"Info" : "Zone 1",
"Currency": [
{
"pcu_id": 2,
"pcu_sign": "€",
"pcu_major": "EUR",
"pcu_minor": "",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
},
{
"pme_id": 5,
"pme_label": "unified",
"comment": "deprecated"
}
],
"TimeRange" : [
{
"time_range_id": 1,
"time_range_from": "20:00:00",
"time_range_to": "08:00:00"
},
{
"time_range_id": 2,
"time_range_from": "08:00:00",
"time_range_to": "20:00:00"
},
{
"time_range_id": 3,
"time_range_from": "00:00:00",
"time_range_to": "08:00:00"
}
],
"PaymentOption": [
{
"pop_id": 1049,
"pop_label": "Zone 1",
"pop_payment_method_id": 5,
"pop_min_time": 30,
"comment_pop_min_time": "30mins -> 30 cent",
"pop_max_time": 90,
"pop_min_price": 30,
"pop_max_price": 150,
"pop_plus_steps": 1,
"pop_minus_steps": 1,
"pop_time_step_config": 1,
"pop_time_step_config_comment": "STATIC",
"pop_allow_overpay": true,
"pop_carry_over": 1,
"pop_business_hours": 0
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 0,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 30
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 2,
"pra_price": 40
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 3,
"pra_price": 50
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 4,
"pra_price": 60
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 5,
"pra_price": 70
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 6,
"pra_price": 80
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 7,
"pra_price": 90
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 8,
"pra_price": 100
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 9,
"pra_price": 110
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 10,
"pra_price": 120
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 11,
"pra_price": 130
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 12,
"pra_price": 140
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 13,
"pra_price": 150
}
],
"Duration": [
{
"pun_duration": 0,
"pun_id": 0,
"pun_label": "0 min"
},
{
"pun_duration": 30,
"pun_id": 1
},
{
"pun_duration": 35,
"pun_id": 2
},
{
"pun_duration": 40,
"pun_id": 3
},
{
"pun_duration": 45,
"pun_id": 4
},
{
"pun_duration": 50,
"pun_id": 5
},
{
"pun_duration": 55,
"pun_id": 6
},
{
"pun_duration": 60,
"pun_id": 7
},
{
"pun_duration": 65,
"pun_id": 8
},
{
"pun_duration": 70,
"pun_id": 9
},
{
"pun_duration": 75,
"pun_id": 10
},
{
"pun_duration": 80,
"pun_id": 11
},
{
"pun_duration": 85,
"pun_id": 12
},
{
"pun_duration": 90,
"pun_id": 13
}
],
"Monday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 90,
"max_price": 150,
"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": 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"
}
]
}
],
"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": 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"
}
]
}
],
"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": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Tuesday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 90,
"max_price": 150,
"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": 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"
}
]
}
],
"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": 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"
}
]
}
],
"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": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Wednesday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 90,
"max_price": 150,
"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": 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"
}
]
}
],
"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": 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"
}
]
}
],
"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": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Thursday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 90,
"max_price": 150,
"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": 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"
}
]
}
],
"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": 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"
}
]
}
],
"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": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Friday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 90,
"max_price": 150,
"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": 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"
}
]
}
],
"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": 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"
}
]
}
],
"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": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Saturday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 840,
"max_price": 1400,
"min_price": 50
}
],
"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": 720,
"prepaid_start" : "12: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": 720,
"carry_over_start" : "12: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"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Sunday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 30,
"max_time" : 840,
"max_price": 1400,
"min_price": 50
}
],
"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" : [
]
}
}]
}