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

Compare commits

base: GerhardHoffmann/customer_335:771a01b8ae774d098ec257f09e45a0bf213e1bd0
Branches Tags
GerhardHoffmann/customer_335:master GerhardHoffmann/customer_335:zg1/zone5 GerhardHoffmann/customer_335:zg1/zone4 GerhardHoffmann/customer_335:zg1/zone3 GerhardHoffmann/customer_335:zg1/zone2 GerhardHoffmann/customer_335:zg1/zone1 GerhardHoffmann/customer_335:zg1/zone6 GerhardHoffmann/customer_335:vorbereitung-sommer-tariffe
..
compare: GerhardHoffmann/customer_335:zg1/zone3
Branches Tags
GerhardHoffmann/customer_335:zg1/zone5 GerhardHoffmann/customer_335:zg1/zone4 GerhardHoffmann/customer_335:zg1/zone3 GerhardHoffmann/customer_335:zg1/zone2 GerhardHoffmann/customer_335:zg1/zone1 GerhardHoffmann/customer_335:master GerhardHoffmann/customer_335:zg1/zone6 GerhardHoffmann/customer_335:vorbereitung-sommer-tariffe

29 Commits
771a01b8ae .. zg1/zone3

Author SHA1 Message Date
GerhardHoffmann 733f2c49a8 fix: 710 cent not selectable using minus-button. 2025-06-06 09:03:36 +02:00
GerhardHoffmann 9e022ca179 fix tariff for zone6: no lunch break; 08:00 - 20:00 2025-06-05 13:16:22 +02:00
GerhardHoffmann 0aba1e6897 provide for zone6 same tariff settings as for zone2 2025-06-05 11:23:46 +02:00
GerhardHoffmann 67160d6e7e remove free holidays for summer term in kleipeda 2025-05-30 11:20:36 +02:00
GerhardHoffmann e98525f251 summer tariff for kleipeda: 1st May - 15th Sep 2025-04-30 11:21:14 +02:00
GerhardHoffmann d00e432f09 free-time from 12:00-14:00 for mon-fri 2025-01-07 12:54:25 +01:00
GerhardHoffmann 74bc6fe99a free of charge from 12:00-14:00 2025-01-07 11:32:53 +01:00
SiegfriedSiegert 14f0811ee9 set terminalPowerOnOffHours: 6:00-22:00 2024-12-18 15:47:36 +01:00
SiegfriedSiegert e02e741cc6 Revert "set terminalPowerOnOffHours: 6:00-22:00" 
This reverts commit 0b49afcf82.
 2024-12-18 15:47:30 +01:00
GerhardHoffmann 9a66c569de fixed typo: cach -> cache 2024-12-18 12:00:03 +01:00
GerhardHoffmann 7c7f4eb3d9 Zone5 to be used as update-help: machines in zone5: 10, 11, 31 2024-12-16 13:35:10 +01:00
GerhardHoffmann 0b49afcf82 set terminalPowerOnOffHours: 6:00-22:00 2024-12-13 13:00:54 +01:00
GerhardHoffmann 2260d38b62 Add special handling for 2025-01-01: 2 hours are free of charge. 2024-12-13 13:00:46 +01:00
SiegfriedSiegert ba92345441 opkg upgrade ptu5-sysconfig 2024-12-11 07:49:09 +01:00
SiegfriedSiegert 9d2a404191 opkg: install ptu-package-versions ... 
... upgrade does not work for packages which are not installed
 2024-12-09 17:34:47 +01:00
SiegfriedSiegert 48201e1388 Systemcontrol: switch on suspendcontroller 2024-12-09 12:46:44 +01:00
SiegfriedSiegert 5682901ac7 SystemControl: inputBrightness = 30 2024-12-04 12:54:00 +01:00
SiegfriedSiegert 8031876844 opkg fix: install wbdw 2024-12-03 16:37:39 +01:00
SiegfriedSiegert b7f5692395 opkg: install wbdw 2024-12-03 16:10:49 +01:00
GerhardHoffmann 33c756397b Copied from Palanga (336) 2024-11-15 12:45:31 +01:00
SiegfriedSiegert cfee96d7e4 Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:41:01 +01:00
SiegfriedSiegert 1748665893 Text: Fix typo 2024-11-05 16:40:56 +01:00
SiegfriedSiegert a8eac0df43 Selling process / Card payment: ask for printing receipt 2024-11-05 16:40:51 +01:00
GerhardHoffmann e4d168ded9 Update files (provided by Thomas) 2024-10-31 12:11:40 +01:00
GerhardHoffmann e39d72c7e7 Fix: switch to red-zone 2024-10-09 10:11:35 +02:00
GerhardHoffmann ffb1b0dfd0 Add libmobilisis for download/update 2024-10-08 12:53:02 +02:00
GerhardHoffmann 7555aeb70b Update tariff-files for winter term 2024-10-02 16:02:33 +02:00
GerhardHoffmann 4ee59594df First step for new tariffs: adapt carry-over-times 2024-09-13 10:24:33 +02:00
GerhardHoffmann a2c8e782d8 Change tariff files according to new settings sent from Eugenijus 2024-09-12 15:41:39 +02:00
16 changed files with 9985 additions and 514 deletions
Expand all files Collapse all files
etc/atb/SystemControl.ini
+66
View File
@@ -0,0 +1,66 @@
[AT_TASKS]
1\arguments=restart, atbapp
1\envs=
1\hourOfDay=4
1\id=ATBAPP_RESTART
1\program=/bin/systemctl
2\arguments=restart, apism
2\envs=
2\hourOfDay=4
2\id=APISM_RESTART
2\program=/bin/systemctl
3\arguments=start, atbupdatetool
3\envs=
3\hourOfDay=1
3\id=PTU5UPDATE
3\program=/bin/systemctl
size=3
[BACKLIGHT]
SensorMax=3500
SensorMin=0
curve=1
dimLowValue=499
dimMax=100
dimMin=20
inputBrightness=30
[COMMON]
startBacklightController=true
startMQTTController=false
startMonitoringController=false
startSuspendController=true
[MONITORING]
http_dataFormat=HTTP
http_host=127.0.0.1
http_ignoreSslErrors=on
http_port=5000
http_protocol=http
http_service=
monitoring_heartbeatInterval=60
protocol=mqtt
useDeviceId=on
useRingbuffer=on
[MQTT]
mqtt_QoS=0
mqtt_TopicDeviceType=MP
mqtt_TopicPrefix=ATB
mqtt_TopicScheme=ATB_ISMAS
mqtt_debug=on
mqtt_host=mqtt2.atb-comm.de
mqtt_password=xyz123
mqtt_port=8883
mqtt_useSsl=on
mqtt_username=testuser
[NETWORKCHECK]
PingHost=google.com
networkRestart=/sbin/ifup -a
setOOO=off
useNetworkCheck=on
[SUSPEND]
program=/home/root/system_powerdown_wakeup.sh
suspendLoopTimerValue=8
etc/atbapp/ATBAPP.ini
+1
View File
@@ -122,3 +122,4 @@ debug=1
parity=0 parity=0
sleep=0 sleep=0
stopBits=1 stopBits=1
terminalPowerOnOffHours="06:00:00,22:00:00"
etc/atbapp/states/APP_States.xml
+10 -1
View File
@@ -228,9 +228,18 @@
<APP_STATE name="CARD_PAYMENT_CONFIRM"> <APP_STATE name="CARD_PAYMENT_CONFIRM">
<ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/> <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="GOODBYE_PAYMENT_OK"/> <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="ASK_RECEIPT"/>
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/> <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
</APP_STATE> </APP_STATE>
<APP_STATE name="ASK_RECEIPT">
<ENTRY_TASK name="TIMER" timeout="8000"/>
<EVENT name="TIMEOUT" resultingState="GOODBYE_PAYMENT_OK"/>
<EVENT name="BUTTON_YES" resultingState="PRINT_RECEIPT"/>
<EVENT name="BUTTON_NO" resultingState="GOODBYE_PAYMENT_OK"/>
<SCREEN name="ASK_RECEIPT"/>
</APP_STATE>
<APP_STATE name="PRINT_RECEIPT"> <APP_STATE name="PRINT_RECEIPT">
<ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/> <ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
<EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/> <EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
etc/atbapp/text/HMI_Texte.xml
+15 -15
View File
@@ -490,7 +490,7 @@
<ru_RU>Максимальная сумма билета</ru_RU> <ru_RU>Максимальная сумма билета</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -600,7 +600,7 @@
<ru_RU>Максимальная сумма билета</ru_RU> <ru_RU>Максимальная сумма билета</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -782,7 +782,7 @@
<ru_RU>Максимальная сумма билета</ru_RU> <ru_RU>Максимальная сумма билета</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -846,7 +846,7 @@
<ru_RU>Максимальная сумма билета</ru_RU> <ru_RU>Максимальная сумма билета</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -898,10 +898,10 @@
<ru_RU> </ru_RU> <ru_RU> </ru_RU>
</Text> </Text>
<Text textnr="0x34"> <Text textnr="0x34">
<lt_LT>Spausdinti bilietą</lt_LT> <lt_LT>Spausdinti kvitą?</lt_LT>
<en_GB>Request Ticket?</en_GB> <en_GB>Print receipt?</en_GB>
<de_DE>Parkschein anfordern?</de_DE> <de_DE>Quittung drucken?</de_DE>
<ru_RU>Заказ билета</ru_RU> <ru_RU>Распечатать квитанцию?</ru_RU>
</Text> </Text>
<Text textnr="0x35"> <Text textnr="0x35">
<lt_LT>ATŠAUKTI</lt_LT> <lt_LT>ATŠAUKTI</lt_LT>
@@ -916,10 +916,10 @@
<ru_RU>ДА</ru_RU> <ru_RU>ДА</ru_RU>
</Text> </Text>
<Text textnr="0x37"> <Text textnr="0x37">
<lt_LT>Permoka!</lt_LT> <lt_LT> </lt_LT>
<en_GB>Overpaid!</en_GB> <en_GB> </en_GB>
<de_DE>Überbezahlt!</de_DE> <de_DE> </de_DE>
<ru_RU>Переплата!</ru_RU> <ru_RU> </ru_RU>
</Text> </Text>
<Text name="user_message_01" textnr="0x81"> <Text name="user_message_01" textnr="0x81">
<lt_LT>Permoka!</lt_LT> <lt_LT>Permoka!</lt_LT>
@@ -934,7 +934,7 @@
<ru_RU>Достигнуто максимальное количество монет!</ru_RU> <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2219,7 +2219,7 @@
<ru_RU>Принимаются только платежные карточки…</ru_RU> <ru_RU>Принимаются только платежные карточки…</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2425,7 +2425,7 @@
<ru_RU>Достигнуто максимальное количество монет!</ru_RU> <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text> </Text>
<Text name="user_message_04" textnr="0x84"> <Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>Minimum parking fee</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
etc/psa_config/DC2C_cash.json
+6 -6
View File
@@ -1,12 +1,12 @@
{ {
"title":"DC2C_cash ", "title":"DC2C_cash ",
"Project":"Klaipeda", "Project":"Klaipeda, Palanga",
"Version":"6.7.1-2024-06-24", "Version":"1.0.0-2024-10-11",
"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,0], "CoinDenom(15..0)":[200,100,50,20,10,0,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,0,0], "CoinValue(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0], "CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
"ExchangeRate":1, "ExchangeRate":1,
"TokenChannel":6, "TokenChannel":1,
"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":21, "LocalTaxRate":21,
etc/psa_config/DC2C_device.json
+1 -1
View File
@@ -17,7 +17,7 @@
"autoOpen":1, "autoOpen":1,
"AccPrint":1, "AccPrint":1,
"DorPrint":0, "DorPrint":0,
"TokPrint":0, "TokPrint":2,
"CBwarnLev":1600, "CBwarnLev":1600,
"CBerrLev":1900, "CBerrLev":1900,
"BattWarn":11800, "BattWarn":11800,
etc/psa_config/DC2C_print03.json
+3 -2
View File
@@ -8,13 +8,14 @@
"styl":"align c", "styl":"align c",
"feed":"margin02", "feed":"margin02",
"feed":"rim02", "feed":"rim02",
"styl":"size 00",
"text":"Sumokėta grynais:", "text":"Sumokėta grynais:",
"vari":"Dynamic02", "vari":"Dynamic02",
"styl":"size 21", "styl":"size 21",
"text":"Geltonoji zona", "text":"Raudonoji zona",
"feed":"nl", "feed":"nl",
"styl":"size 10", "styl":"size 10",
"text":"tarifas 60 ct/h", "text":"tarifas 1,50Eur/h",
"feed":"nl", "feed":"nl",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",
etc/psa_config/DC2C_print07.json
+3 -3
View File
@@ -4,17 +4,17 @@
"Version":"1.1.3-2024-08-08", "Version":"1.1.3-2024-08-08",
"styl":"font 24", "styl":"font 24",
"styl":"csiz 08", "styl":"csiz 08",
"styl":"size 00",
"styl":"align c", "styl":"align c",
"feed":"margin02", "feed":"margin02",
"feed":"rim02", "feed":"rim02",
"styl":"size 00",
"text":"Sumokėta kortele:", "text":"Sumokėta kortele:",
"vari":"Dynamic02", "vari":"Dynamic02",
"styl":"size 21", "styl":"size 21",
"text":"Geltonoji zona", "text":"Raudonoji zona",
"feed":"nl", "feed":"nl",
"styl":"size 10", "styl":"size 10",
"text":"tarifas 60 ct/h", "text":"tarifas 1,50Eur/h",
"feed":"nl", "feed":"nl",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",
etc/psa_config/DC2C_print30.json
Executable
+44
View File
@@ -0,0 +1,44 @@
{
"title":"DC2C_pri30",
"Project":"Klaipeda",
"Version":"1.0.0-2024-10-11",
"text":"",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"styl":"size 11",
"feed":"nl",
"text":"TestTicket:",
"feed":"nl",
"styl":"size 00",
"vari":"date ge",
"vari":"time long",
"feed":"nl",
"text":"CustomerNr.: ",
"vari":"cunu",
"text":"MachineNr: ",
"vari":"manu",
"text":"Adresas: ",
"vari":"location",
"feed":"nl",
"text":"**Klaipėdos keleivinis transportas ",
"feed":"nl",
"text":" * * * * * * * * * ",
"feed":"nl",
"feed":"eject"
}
etc/psa_tariff/tariff01.json
+664 -232
View File
@@ -1,7 +1,7 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "1.0.0-2024-08-01T09:32:12+02:00", "Version" : "2.1.0-2024-04-23T12:36:12+02:00",
"Info" : "Red Zone", "Info" : "Red Zone (center)",
"Currency": [ "Currency": [
{ {
"pcu_id": 2, "pcu_id": 2,
@@ -27,6 +27,11 @@
{ {
"pme_id": 4, "pme_id": 4,
"pme_label": "steps" "pme_label": "steps"
},
{
"pme_id": 5,
"pme_label": "unified",
"comment": "deprecated"
} }
], ],
"TimeRange" : [ "TimeRange" : [
@@ -46,171 +51,11 @@
"time_range_to": "08:00:00" "time_range_to": "08:00:00"
} }
], ],
"Prepaid": [
{
"prepaid_id": 1,
"prepaid_anytime": true,
"prepaid_never": false
},
{
"prepaid_id": 2,
"prepaid_anytime": false,
"prepaid_never": true
},
{
"prepaid_id": 3,
"prepaid_anytime": false,
"prepaid_never": false,
"prepaid_static_start": "22:00:00",
"prepaid_static_end": "08:00:00"
}
],
"CarryOver": [
{
"carry_over_id" : 1,
"carry_over_week" : [
{
"carry_over_day" : 1,
"carry_over_day_comment" : "Monday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 2,
"carry_over_day_comment" : "Tuesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 3,
"carry_over_day_comment" : "Wednesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 4,
"carry_over_day_comment" : "Thursday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 5,
"carry_over_day_comment" : "Friday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 6,
"carry_over_day_comment" : "Saturday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 7,
"carry_over_day_comment" : "Sunday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
}
]
},
{
"carry_over_id" : 2,
"carry_over_week" : [
{
"carry_over_day" : 1,
"carry_over_day_comment" : "Monday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 2,
"carry_over_day_comment" : "Tuesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 3,
"carry_over_day_comment" : "Wednesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 4,
"carry_over_day_comment" : "Thursday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 5,
"carry_over_day_comment" : "Friday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 6,
"carry_over_day_comment" : "Saturday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 7,
"carry_over_day_comment" : "Sunday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
}
]
}
],
"PaymentOption": [ "PaymentOption": [
{ {
"pop_id": 1049, "pop_id": 1049,
"pop_label": "Zone 1", "pop_label": "Zone 1",
"pop_payment_method_id": 4, "pop_payment_method_id": 5,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_min_time": 12, "pop_min_time": 12,
"comment_pop_min_time": "12mins -> 30 cent", "comment_pop_min_time": "12mins -> 30 cent",
"pop_max_time": 840, "pop_max_time": 840,
@@ -221,15 +66,9 @@
"pop_minus_steps": 1, "pop_minus_steps": 1,
"pop_time_step_config": 1, "pop_time_step_config": 1,
"pop_time_step_config_comment": "STATIC", "pop_time_step_config_comment": "STATIC",
"pop_allow_overpay": false, "pop_allow_overpay": true,
"pop_carry_over": 1, "pop_carry_over": 1,
"pop_carry_over_option_id": 1, "pop_business_hours": 0
"pop_prepaid_option_id" : 3,
"pop_carry_over_time_range": 1,
"pop_carry_over_start_time_range": 2,
"pop_carry_over_end_time_range": 3,
"pop_business_hours": 163584,
"comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
} }
], ],
"PaymentRate": [ "PaymentRate": [
@@ -2346,73 +2185,666 @@
"pun_label": "840 min" "pun_label": "840 min"
} }
], ],
"WeekDaysWorktime": [ "Monday" : [{
"default" : {
"payment_settings" : [
{ {
"pwd_id": 621, "min_time" : 12,
"pwd_period_week_day_id": 36, "max_time" : 840,
"pwd_period_day_in_week_id": 1, "max_price": 2100,
"pwd_time_from": "08:00:00", "min_price": 30
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 627,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 7,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
} }
], ],
"PeriodYear": [ "prepaid_settings" : [
{ {
"pye_id": 1, "prepaid_ranges" : [
"pye_label": "May - September", {
"pye_start_month": 5, "prepaid_id" : 1,
"pye_start_day": 1, "prepaid_duration": 480,
"pye_end_month": 9, "prepaid_start" : "00:00:00",
"pye_end_day": 15 "prepaid_end": "08:00:00"
}, },
{ {
"pye_id": 2, "prepaid_id" : 2,
"pye_label": "September - April", "prepaid_duration": 120,
"pye_start_month": 9, "prepaid_start" : "12:00:00",
"pye_start_day": 16, "prepaid_end": "14:00:00"
"pye_end_month": 4, },
"pye_end_day": 30 {
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}],
"Tuesday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}],
"Wednesday" : [{
"2025-01-01" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [
]
},
"default" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}],
"Thursday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}],
"Friday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}],
"Saturday" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [{
"default" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"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": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}]
} }
etc/psa_tariff/tariff02.json
+645 -234
View File
@@ -1,7 +1,7 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "1.0.0-2024-08-01T09:32:12+02:00", "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
"Info" : "Yellow Zone", "Info" : "Yellow Zone (plus)",
"Currency": [ "Currency": [
{ {
"pcu_id": 2, "pcu_id": 2,
@@ -27,6 +27,11 @@
{ {
"pme_id": 4, "pme_id": 4,
"pme_label": "steps" "pme_label": "steps"
},
{
"pme_id": 5,
"pme_label": "unified",
"comment": "deprecated"
} }
], ],
"TimeRange" : [ "TimeRange" : [
@@ -50,12 +55,9 @@
{ {
"pop_id": 1049, "pop_id": 1049,
"pop_label": "Zone 1", "pop_label": "Zone 1",
"pop_payment_method_id": 4, "pop_payment_method_id": 5,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_min_time": 30, "pop_min_time": 30,
"comment_pop_min_time": "30mins -> 30 cent", "comment_pop_min_time": "12mins -> 30 cent",
"pop_max_time": 840, "pop_max_time": 840,
"comment_pop_max_time": "840mins = 14h -> 21 euros", "comment_pop_max_time": "840mins = 14h -> 21 euros",
"pop_min_price": 30, "pop_min_price": 30,
@@ -64,172 +66,9 @@
"pop_minus_steps": 1, "pop_minus_steps": 1,
"pop_time_step_config": 1, "pop_time_step_config": 1,
"pop_time_step_config_comment": "STATIC", "pop_time_step_config_comment": "STATIC",
"pop_allow_overpay": false, "pop_allow_overpay": true,
"pop_carry_over": 1, "pop_carry_over": 1,
"pop_carry_over_option_id": 1, "pop_business_hours": 0
"pop_prepaid_option_id" : 3,
"pop_carry_over_time_range": 1,
"pop_carry_over_start_time_range": 2,
"pop_carry_over_end_time_range": 3,
"pop_business_hours": 163584,
"comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
}
],
"Prepaid": [
{
"prepaid_id": 1,
"prepaid_anytime": true,
"prepaid_never": false
},
{
"prepaid_id": 2,
"prepaid_anytime": false,
"prepaid_never": true
},
{
"prepaid_id": 3,
"prepaid_anytime": false,
"prepaid_never": false,
"prepaid_static_start": "22:00:00",
"prepaid_static_end": "08:00:00"
}
],
"CarryOver": [
{
"carry_over_id" : 1,
"carry_over_week" : [
{
"carry_over_day" : 1,
"carry_over_day_comment" : "Monday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 2,
"carry_over_day_comment" : "Tuesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 3,
"carry_over_day_comment" : "Wednesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 4,
"carry_over_day_comment" : "Thursday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 5,
"carry_over_day_comment" : "Friday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 6,
"carry_over_day_comment" : "Saturday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 7,
"carry_over_day_comment" : "Sunday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 600,
"carry_over_static_start" : "22:00:00",
"carry_over_static_end": "08:00:00"
}
]
},
{
"carry_over_id" : 2,
"carry_over_week" : [
{
"carry_over_day" : 1,
"carry_over_day_comment" : "Monday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 2,
"carry_over_day_comment" : "Tuesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 3,
"carry_over_day_comment" : "Wednesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 4,
"carry_over_day_comment" : "Thursday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 5,
"carry_over_day_comment" : "Friday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 6,
"carry_over_day_comment" : "Saturday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
},
{
"carry_over_day" : 7,
"carry_over_day_comment" : "Sunday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "20:00:00",
"carry_over_static_end": "08:00:00"
}
]
} }
], ],
"PaymentRate": [ "PaymentRate": [
@@ -656,6 +495,36 @@
{ {
"pra_payment_option_id": 1049, "pra_payment_option_id": 1049,
"pra_payment_unit_id": 84, "pra_payment_unit_id": 84,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 85,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 86,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 87,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 88,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 89,
"pra_price": 0
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 90,
"pra_price": 840 "pra_price": 840
} }
], ],
@@ -1081,78 +950,620 @@
"pun_label": "830 min" "pun_label": "830 min"
}, },
{ {
"pun_duration": 840, "pun_duration": 830,
"pun_id": 84, "pun_id": 84,
"pun_label": "840 min" "pun_label": "840 min"
},
{
"pun_duration": 830,
"pun_id": 85,
"pun_label": "840 min"
},
{
"pun_duration": 830,
"pun_id": 86,
"pun_label": "840 min"
},
{
"pun_duration": 830,
"pun_id": 87,
"pun_label": "840 min"
},
{
"pun_duration": 830,
"pun_id": 88,
"pun_label": "840 min"
},
{
"pun_duration": 830,
"pun_id": 89,
"pun_label": "840 min"
},
{
"pun_duration": 840,
"pun_id": 90,
"pun_label": "840 min"
} }
], ],
"WeekDaysWorktime": [ "Monday" : [{
"default" : {
"payment_settings" : [
{ {
"pwd_id": 621, "min_time" : 30,
"pwd_period_week_day_id": 36, "max_time" : 840,
"pwd_period_day_in_week_id": 1, "max_price": 840,
"pwd_time_from": "08:00:00", "min_price": 30
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 7,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
} }
], ],
"PeriodYear": [ "prepaid_settings" : [
{ {
"pye_id": 1, "prepaid_ranges" : [
"pye_label": "May - September", {
"pye_start_month": 5, "prepaid_id" : 1,
"pye_start_day": 1, "prepaid_duration": 480,
"pye_end_month": 9, "prepaid_start" : "00:00:00",
"pye_end_day": 15 "prepaid_end": "08:00:00"
}, },
{ {
"pye_id": 2, "prepaid_id" : 2,
"pye_label": "September - April", "prepaid_duration": 120,
"pye_start_month": 9, "prepaid_start" : "12:00:00",
"pye_start_day": 16, "prepaid_end": "14:00:00"
"pye_end_month": 4, },
"pye_end_day": 30 {
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22: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": 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" : [
]
}
}],
"Tuesday" : [{
"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": 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"
}
]
}
],
"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": 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" : [
]
}
}],
"Wednesday" : [{
"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": 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"
}
]
}
],
"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": 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" : [
]
}
}],
"Thursday" : [{
"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": 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"
}
]
}
],
"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": 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" : [
]
}
}],
"Friday" : [{
"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": 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"
}
]
}
],
"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": 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" : [
]
}
}],
"Saturday" : [{
"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": 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"
}
]
}
],
"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": 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" : [{
"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": 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"
}
]
}
],
"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": 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" : [
]
}
}]
} }
etc/psa_tariff/tariff03.json
+2850
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff04.json
+1624
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff05.json
+2636
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff06.json
+1387
View File
File diff suppressed because it is too large Load Diff
etc/psa_update/opkg_commands
+10
View File
@@ -8,13 +8,23 @@ opkg update
opkg install prepare-update opkg install prepare-update
# #
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
opkg --cache /var/cache/opkg --download-only upgrade atbqt opkg --cache /var/cache/opkg --download-only upgrade atbqt
opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg --download-only install ptu-package-versions
opkg --cache /var/cache/opkg --download-only install wbdw
opkg --cache /var/cache/opkg --download-only upgrade ptu5-sysconfig
# #
opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
opkg --cache /var/cache/opkg upgrade libmobilisis-calc
opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
opkg --cache /var/cache/opkg upgrade atb-dc-libraries opkg --cache /var/cache/opkg upgrade atb-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-plugin-dc opkg --cache /var/cache/opkg upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atbqt opkg --cache /var/cache/opkg upgrade atbqt
opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg install ptu-package-versions
opkg --cache /var/cache/opkg install wbdw
opkg --cache /var/cache/opkg upgrade ptu5-sysconfig