Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
fa71def31a | |||
c0abeb7989 | |||
547331592e | |||
a0c9ec223a | |||
553f376583 | |||
5c0ee36168 | |||
141c83848e | |||
f271722cd8 | |||
536f64af46 | |||
9d1c99c617 | |||
1c203cacfb | |||
28a9b035f4 | |||
ffd1e142e6 | |||
d13e716c4d | |||
356b1df277 | |||
4c503f083b | |||
eda56d83e0 | |||
9bc4c69886 | |||
813f00c1e6 | |||
56df6fdafe | |||
340ec04e3b | |||
594c6365de | |||
3af68e30e5 | |||
e441d62f4d | |||
a813ea48bc | |||
f5e8909c91 |
@ -18,15 +18,12 @@
|
|||||||
<EVENT name="TIMEOUT" resultingState="CASH_PAYMENT"
|
<EVENT name="TIMEOUT" resultingState="CASH_PAYMENT"
|
||||||
setCashInputMode="PAY_UP"
|
setCashInputMode="PAY_UP"
|
||||||
setProduct="SHORT_TERM_PARKING"
|
setProduct="SHORT_TERM_PARKING"
|
||||||
setPaymentType="CASH"/>/>
|
setPaymentType="CASH"/>
|
||||||
</APP_STATE>
|
</APP_STATE>
|
||||||
|
|
||||||
|
|
||||||
<APP_STATE name="PAYMENT_SELECTION">
|
<APP_STATE name="PAYMENT_SELECTION">
|
||||||
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
||||||
<EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP"
|
|
||||||
setProduct="SHORT_TERM_PARKING"
|
|
||||||
setPaymentType="CASH"/>
|
|
||||||
<EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
|
<EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
|
||||||
<EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP"
|
<EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP"
|
||||||
setProduct="SHORT_TERM_PARKING"
|
setProduct="SHORT_TERM_PARKING"
|
||||||
@ -81,6 +78,9 @@
|
|||||||
</APP_STATE>
|
</APP_STATE>
|
||||||
<APP_STATE name="CASH_PAYMENT_INPUT">
|
<APP_STATE name="CASH_PAYMENT_INPUT">
|
||||||
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
|
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
|
||||||
|
<!-- 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" resultingState="CASH_PAYMENT_INPUT"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_OVERPAYED_ASK"/>
|
<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_FINISHED" resultingState="PRINT_TICKET_CASH"/>
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
"title":"DC2C_cash ",
|
"title":"DC2C_cash ",
|
||||||
"project":"Galltuer",
|
"project":"Galltuer",
|
||||||
"version":"15.10.2023 14:55 02.00.06",
|
"version":"15.10.2023 14:55 02.00.06",
|
||||||
"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
|
"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,40,1],
|
||||||
"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
|
"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,40,3],
|
||||||
"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
|
"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
|
||||||
"ExchangeRate":1,
|
"ExchangeRate":1,
|
||||||
"TokenChannel":6,
|
"TokenChannel":0,
|
||||||
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
|
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
|
||||||
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
|
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
|
||||||
"LocalTaxRate":19,
|
"LocalTaxRate":19,
|
||||||
@ -15,4 +15,3 @@
|
|||||||
"Discount":0
|
"Discount":0
|
||||||
}
|
}
|
||||||
#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
|
#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
|
||||||
|
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"title":"DC2C_config",
|
|
||||||
"project":"Kirchdorf",
|
|
||||||
"version":"22.01.2024 00001",
|
|
||||||
"custNum":743,
|
|
||||||
"machNum":1000,
|
|
||||||
"borough":1,
|
|
||||||
"zone":1,
|
|
||||||
"alias":0,
|
|
||||||
"location":""
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"title":"DC2C_device",
|
"title":"DC2C_device",
|
||||||
"project":"Galltuer",
|
"project":"Kirchdorf",
|
||||||
"Version":"22.01.2024 00103",
|
"Version":"02.07.2024 00103",
|
||||||
"printer":1,
|
"printer":1,
|
||||||
"coinChk":1,
|
"coinChk":1,
|
||||||
"mifRd":1,
|
"mifRd":1,
|
||||||
@ -23,5 +23,13 @@
|
|||||||
"BattWarn":11800,
|
"BattWarn":11800,
|
||||||
"BattErr":11200,
|
"BattErr":11200,
|
||||||
"foreign":1,
|
"foreign":1,
|
||||||
"refPrint":0
|
"refundPrint":1,
|
||||||
|
"billWarnLev":400,
|
||||||
|
"billFullLev":500,
|
||||||
|
"housing":1,
|
||||||
|
"changeCoins":1,
|
||||||
|
"dev_aux1":0,
|
||||||
|
"dev_aux2":0,
|
||||||
|
"dev_aux3":0,
|
||||||
|
"dev_aux4":0
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"Project" : "Kirchdorf",
|
"Project" : "Kirchdorf",
|
||||||
"Version" : "1.1.0",
|
"Version" : "1.1.0-2024-05-14T08:48:13+02:00",
|
||||||
"Info" : "",
|
"Info" : "",
|
||||||
"Currency": [
|
"Currency": [
|
||||||
{
|
{
|
||||||
|
724
etc/psa_tariff/tariff02.json
Normal file
724
etc/psa_tariff/tariff02.json
Normal 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" : [
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
@ -6,14 +6,11 @@
|
|||||||
#
|
#
|
||||||
opkg update
|
opkg update
|
||||||
opkg install prepare-update
|
opkg install prepare-update
|
||||||
# opkg install atbupdatetool
|
#
|
||||||
# opkg install mxt-touch-reset
|
opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
|
||||||
# opkg remove atb-accountingtool
|
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
|
||||||
# opkg install atb-accountingtool
|
opkg --cache /var/cache/opkg --download-only upgrade atbqt
|
||||||
opkg --cache /var/cache/opkg --download-only upgrade
|
#
|
||||||
opkg --cache /var/cache/opkg upgrade
|
opkg --cache /var/cache/opkg upgrade atb-dc-libraries
|
||||||
# opkg remove apism
|
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
|
||||||
# opkg install apism
|
opkg --cache /var/cache/opkg upgrade atbqt
|
||||||
opkg info apism
|
|
||||||
opkg info atbqt
|
|
||||||
opkg info atbupdatetool
|
|
||||||
|
Loading…
Reference in New Issue
Block a user