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

Compare commits

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

9 Commits
zg1/zone6 ... 33c756397b

Author SHA1 Message Date
Gerhard Hoffmann
33c756397b Copied from Palanga (336) 2024-11-15 12:45:31 +01:00
Siegfried Siegert
cfee96d7e4 Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:41:01 +01:00
Siegfried Siegert
1748665893 Text: Fix typo 2024-11-05 16:40:56 +01:00
Siegfried Siegert
a8eac0df43 Selling process / Card payment: ask for printing receipt 2024-11-05 16:40:51 +01:00
Gerhard Hoffmann
e4d168ded9 Update files (provided by Thomas) 2024-10-31 12:11:40 +01:00
Gerhard Hoffmann
e39d72c7e7 Fix: switch to red-zone 2024-10-09 10:11:35 +02:00
Gerhard Hoffmann
ffb1b0dfd0 Add libmobilisis for download/update 2024-10-08 12:53:02 +02:00
Gerhard Hoffmann
7555aeb70b Update tariff-files for winter term 2024-10-02 16:02:33 +02:00
Gerhard Hoffmann
4ee59594df First step for new tariffs: adapt carry-over-times 2024-09-13 10:24:33 +02:00
12 changed files with 3325 additions and 1007 deletions
Expand all files Collapse all files

13
etc/atbapp/states/APP_States.xml
View File

@@ -228,9 +228,18 @@
<APP_STATE name="CARD_PAYMENT_CONFIRM">
<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"/>
</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">
<ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
<EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>

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

@@ -490,7 +490,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
@@ -600,7 +600,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
@@ -782,7 +782,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
@@ -846,7 +846,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
@@ -898,10 +898,10 @@
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x34">
<lt_LT>Spausdinti bilietą</lt_LT>
<en_GB>Request Ticket?</en_GB>
<de_DE>Parkschein anfordern?</de_DE>
<ru_RU>Заказ билета</ru_RU>
<lt_LT>Spausdinti kvitą?</lt_LT>
<en_GB>Print receipt?</en_GB>
<de_DE>Quittung drucken?</de_DE>
<ru_RU>Распечатать квитанцию?</ru_RU>
</Text>
<Text textnr="0x35">
<lt_LT>ATŠAUKTI</lt_LT>
@@ -916,10 +916,10 @@
<ru_RU>ДА</ru_RU>
</Text>
<Text textnr="0x37">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid!</en_GB>
<de_DE>Überbezahlt!</de_DE>
<ru_RU>Переплата!</ru_RU>
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="user_message_01" textnr="0x81">
<lt_LT>Permoka!</lt_LT>
@@ -934,7 +934,7 @@
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2219,7 +2219,7 @@
<ru_RU>Принимаются только платежные карточки…</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2425,7 +2425,7 @@
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<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>
<de_DE>Mindestparkgebühr</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU>

12
etc/psa_config/DC2C_cash.json
View File

@@ -1,12 +1,12 @@
{
"title":"DC2C_cash ",
"Project":"Klaipeda",
"Version":"6.7.1-2024-06-24",
"CoinDenom(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,5,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,0],
"Project":"Klaipeda, Palanga",
"Version":"1.0.0-2024-10-11",
"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,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,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],
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"LocalTaxRate":21,

2
etc/psa_config/DC2C_device.json
View File

@@ -17,7 +17,7 @@
"autoOpen":1,
"AccPrint":1,
"DorPrint":0,
"TokPrint":0,
"TokPrint":2,
"CBwarnLev":1600,
"CBerrLev":1900,
"BattWarn":11800,

5
etc/psa_config/DC2C_print03.json
View File

@@ -8,13 +8,14 @@
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"styl":"size 00",
"text":"Sumokėta grynais:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Geltonoji zona",
"text":"Raudonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 60 ct/h",
"text":"tarifas 1,50Eur/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",

6
etc/psa_config/DC2C_print07.json
View File

@@ -4,17 +4,17 @@
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"styl":"size 00",
"text":"Sumokėta kortele:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Geltonoji zona",
"text":"Raudonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 60 ct/h",
"text":"tarifas 1,50Eur/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",

44
etc/psa_config/DC2C_print30.json Executable file
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"
}

702
etc/psa_tariff/tariff01.json
View File

@@ -1,7 +1,7 @@
{
"Project" : "Kleipeda",
"Version" : "1.0.0-2024-08-01T09:32:12+02:00",
"Info" : "Red Zone",
"Version" : "2.0.0-2024-10-01T09:32:12+02:00",
"Info" : "Red Zone (center)",
"Currency": [
{
"pcu_id": 2,
@@ -27,18 +27,23 @@
{
"pme_id": 4,
"pme_label": "steps"
},
{
"pme_id": 5,
"pme_label": "unified",
"comment": "deprecated"
}
],
"TimeRange" : [
{
"time_range_id": 1,
"time_range_from": "22:00:00",
"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": "22:00:00"
"time_range_to": "20:00:00"
},
{
"time_range_id": 3,
@@ -46,171 +51,11 @@
"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": [
{
"pop_id": 1049,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_payment_method_id": 5,
"pop_min_time": 12,
"comment_pop_min_time": "12mins -> 30 cent",
"pop_max_time": 840,
@@ -221,15 +66,9 @@
"pop_minus_steps": 1,
"pop_time_step_config": 1,
"pop_time_step_config_comment": "STATIC",
"pop_allow_overpay": false,
"pop_allow_overpay": true,
"pop_carry_over": 1,
"pop_carry_over_option_id": 1,
"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"
"pop_business_hours": 0
}
],
"PaymentRate": [
@@ -2346,73 +2185,452 @@
"pun_label": "840 min"
}
],
"WeekDaysWorktime": [
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "08:00:00",
"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": [
{
"pye_id": 1,
"pye_label": "May - September",
"pye_start_month": 5,
"pye_start_day": 1,
"pye_end_month": 9,
"pye_end_day": 15
},
{
"pye_id": 2,
"pye_label": "September - April",
"pye_start_month": 9,
"pye_start_day": 16,
"pye_end_month": 4,
"pye_end_day": 30
}
]
"Monday" : [{
"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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20: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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Wednesday" : [{
"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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20: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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20: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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20: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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20: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": 240,
"prepaid_start" : "20: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": 240,
"carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_start" : "08:00:00",
"service_end": "20:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}]
}

1194
etc/psa_tariff/tariff02.json
View File

File diff suppressed because it is too large Load Diff

1124
etc/psa_tariff/tariff03.json
View File

File diff suppressed because it is too large Load Diff

1194
etc/psa_tariff/tariff04.json
View File

File diff suppressed because it is too large Load Diff

6
etc/psa_update/opkg_commands
View File

@@ -8,13 +8,19 @@ opkg 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 libmobilisis-calc
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-plugin-dc
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 upgrade ptu-package-versions
#
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-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atbqt
opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg upgrade ptu-package-versions