5 Commits

10 changed files with 3295 additions and 990 deletions

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,

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,

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",

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",

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"
}

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-2024-10-01T09:32:12+02:00",
"Info" : "Red Zone", "Info" : "Red Zone (center)",
"Currency": [ "Currency": [
{ {
"pcu_id": 2, "pcu_id": 2,
@@ -27,18 +27,23 @@
{ {
"pme_id": 4, "pme_id": 4,
"pme_label": "steps" "pme_label": "steps"
},
{
"pme_id": 5,
"pme_label": "unified",
"comment": "deprecated"
} }
], ],
"TimeRange" : [ "TimeRange" : [
{ {
"time_range_id": 1, "time_range_id": 1,
"time_range_from": "22:00:00", "time_range_from": "20:00:00",
"time_range_to": "08:00:00" "time_range_to": "08:00:00"
}, },
{ {
"time_range_id": 2, "time_range_id": 2,
"time_range_from": "08:00:00", "time_range_from": "08:00:00",
"time_range_to": "22:00:00" "time_range_to": "20:00:00"
}, },
{ {
"time_range_id": 3, "time_range_id": 3,
@@ -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,452 @@
"pun_label": "840 min" "pun_label": "840 min"
} }
], ],
"WeekDaysWorktime": [ "Monday" : [{
{ "default" : {
"pwd_id": 621, "payment_settings" : [
"pwd_period_week_day_id": 36, {
"pwd_period_day_in_week_id": 1, "min_time" : 12,
"pwd_time_from": "08:00:00", "max_time" : 840,
"pwd_time_to": "22:00:00" "max_price": 2100,
}, "min_price": 30
{ }
"pwd_id": 622, ],
"pwd_period_week_day_id": 36, "prepaid_settings" : [
"pwd_period_day_in_week_id": 2, {
"pwd_time_from": "08:00:00", "prepaid_ranges" : [
"pwd_time_to": "22:00:00" {
}, "prepaid_id" : 1,
{ "prepaid_duration": 480,
"pwd_id": 623, "prepaid_start" : "00:00:00",
"pwd_period_week_day_id": 36, "prepaid_end": "08:00:00"
"pwd_period_day_in_week_id": 3, },
"pwd_time_from": "08:00:00", {
"pwd_time_to": "22:00:00" "prepaid_id" : 2,
}, "prepaid_duration": 240,
{ "prepaid_start" : "20:00:00",
"pwd_id": 624, "prepaid_end": "24:00:00"
"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" ],
}, "carry_over_settings" : [
{ {
"pwd_id": 625, "carry_over_ranges" : [
"pwd_period_week_day_id": 36, {
"pwd_period_day_in_week_id": 5, "carry_over_id" : 1,
"pwd_time_from": "08:00:00", "carry_over_if": "always",
"pwd_time_to": "22:00:00" "carry_over_duration": 480,
}, "carry_over_start" : "00:00:00",
{ "carry_over_end": "08:00:00"
"pwd_id": 626, },
"pwd_period_week_day_id": 36, {
"pwd_period_day_in_week_id": 6, "carry_over_id" : 2,
"pwd_time_from": "08:00:00", "carry_over_if": "always",
"pwd_time_to": "22:00:00" "carry_over_duration": 240,
}, "carry_over_start" : "20:00:00",
{ "carry_over_end": "24: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" "service_settings" : [
} {
], "service_ranges" : [
"PeriodYear": [ {
{ "service_id" : 1,
"pye_id": 1, "service_duration": 720,
"pye_label": "May - September", "service_start" : "08:00:00",
"pye_start_month": 5, "service_end": "20:00:00"
"pye_start_day": 1, }
"pye_end_month": 9, ]
"pye_end_day": 15 }
}, ],
{ "out_of_service_settings" : [
"pye_id": 2, ]
"pye_label": "September - April", }
"pye_start_month": 9, }],
"pye_start_day": 16, "Tuesday" : [{
"pye_end_month": 4, "default" : {
"pye_end_day": 30 "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" : [
]
}
}]
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -8,12 +8,14 @@ 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 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