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

Compare commits

base: GerhardHoffmann:zg1/zone3
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:701f639b0f32f7678586a474a91ffb12f1b9f555
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

52 Commits
zg1/zone3 ... 701f639b0f

Author SHA1 Message Date
Gerhard Hoffmann
701f639b0f Zone5 to be used as update-help: machines in zone5: 10, 11, 31 2024-12-16 13:40:09 +01:00
Gerhard Hoffmann
979fc6d66c set terminalPowerOnOffHours: 6:00-22:00 2024-12-13 12:49:12 +01:00
Gerhard Hoffmann
a5cd854f36 Add special handling for 2025-01-01: 2 hours are free of charge. 2024-12-13 12:38:07 +01:00
Siegfried Siegert
571d0af7cc opkg upgrade ptu5-sysconfig 2024-12-11 07:50:02 +01:00
Siegfried Siegert
4a56ba8c3e opkg: install ptu-package-versions ... 
... upgrade does not work for packages which are not installed
 2024-12-09 17:33:17 +01:00
Siegfried Siegert
1b859be0d4 Systemcontrol: switch on suspendcontroller 2024-12-09 12:47:36 +01:00
Siegfried Siegert
d15b7d8f83 SystemControl: inputBrightness = 30 2024-12-04 12:52:44 +01:00
Siegfried Siegert
c43764b2b0 opkg fix: install wbdw 2024-12-03 16:37:07 +01:00
Siegfried Siegert
25462147b0 opkg: install wbdw 2024-12-03 16:12:00 +01:00
Gerhard Hoffmann
689ae2964f Copied from Palanga (336) 2024-11-15 12:43:25 +01:00
Siegfried Siegert
60fccdc917 Merge branch 'pu/ask_for_receipt' 2024-11-05 16:34:55 +01:00
Siegfried Siegert
5285eb5c05 Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:33:34 +01:00
Siegfried Siegert
6ca423b293 Text: Fix typo 2024-11-05 16:09:07 +01:00
Siegfried Siegert
dd2d554d01 Selling process / Card payment: ask for printing receipt 2024-11-05 15:50:04 +01:00
Siegfried Siegert
0f06e63826 Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335 2024-11-05 15:38:33 +01:00
Gerhard Hoffmann
dabd44197d Update files (provided by Thomas) 2024-10-31 12:09:39 +01:00
Gerhard Hoffmann
80093de987 Add libmobilisis for download/update 2024-10-08 12:50:45 +02:00
Gerhard Hoffmann
8e5de08bd0 Update tariff-files for winter term 2024-10-02 15:59:02 +02:00
Gerhard Hoffmann
295dc4badc tariff-files for winter-term 2024-10-01 14:21:04 +02:00
Gerhard Hoffmann
93de81b036 tariff-files for winter-term 2024-10-01 12:42:24 +02:00
Gerhard Hoffmann
b9a65a865e Merge branch 'master' of https://ptu-config.atb-comm.de/ATB/customer_335 2024-09-13 10:13:16 +02:00
Gerhard Hoffmann
6f051a6cbc First step for new tariffs: 
Change times (carry-over-limts).
 2024-09-13 10:10:27 +02:00
Gerhard Hoffmann
11e0374581 Change tariff files according to new settings sent from Eugenijus 2024-09-12 15:37:52 +02:00
Gerhard Hoffmann
307503e402 Updated as provided by t.Sax 2024-09-05 08:09:30 +02:00
Gerhard Hoffmann
82e21f98f6 Add atb-plugin-calculateprice-mobilisis. 2024-08-30 11:26:40 +02:00
Gerhard Hoffmann
b90be66e36 Update jsons as provided by T.Sax 2024-08-27 16:21:56 +02:00
Gerhard Hoffmann
f5297f8fcf Set DorPrint=0 2024-08-27 08:45:54 +02:00
Gerhard Hoffmann
5976a30ea3 updated by th.sax 2024-08-22 15:33:42 +02:00
Gerhard Hoffmann
943c62a25a checking new file 22.08.2024 2024-08-22 13:25:37 +02:00
Gerhard Hoffmann
56852fc116 smd-2024.08.20 only with CP1257 2024-08-22 08:27:31 +02:00
Gerhard Hoffmann
2702a71343 Add settinge time-step-config and pop-allow-overpay 2024-08-21 18:00:10 +02:00
Gerhard Hoffmann
95c2500bdb Add settinge time-step-config and pop-allow-overpay 2024-08-21 17:56:53 +02:00
Siegfried Siegert
b09f81692c HMI: Textupdate 2024-08-09 14:01:43 +02:00
Siegfried Siegert
bbd31a5f2e Textupdate: screen Overpaid 2024-08-09 13:40:48 +02:00
Siegfried Siegert
dc4c53ae4a ATBAPP: states: request for overpayment 2024-08-09 11:49:31 +02:00
Siegfried Siegert
a21945ae8c Update text: "Wait for card terminal" 2024-08-08 17:02:42 +02:00
Siegfried Siegert
405394f08c Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335 2024-08-08 17:02:23 +02:00
Gerhard Hoffmann
384efce14b Update jsons-files as provided by Thomas 2024-08-08 10:34:04 +02:00
Siegfried Siegert
0f7ddce50a Setup opkg-commands 2024-08-07 17:16:16 +02:00
Siegfried Siegert
916facb9f7 ATBAPP: states: skip printing bank receipt 2024-08-07 16:44:37 +02:00
Siegfried Siegert
c7a2b326fe ATBAPP: add current states 2024-08-07 16:42:46 +02:00
Siegfried Siegert
d3adea9018 ATBAPP: setPrinterEncoding and printerLocale 2024-08-07 16:39:10 +02:00
Siegfried Siegert
d01525264c Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335 2024-08-07 16:37:13 +02:00
Gerhard Hoffmann
f8b00f5fb8 Tariff for Zone 2 (Yellow) in Kleipeda 2024-08-01 17:20:23 +02:00
Gerhard Hoffmann
1cd03956cf Tariff for Zone 1 (Red) in Kleipeda 2024-08-01 17:09:47 +02:00
Gerhard Hoffmann
4c2b34a0bd Add JSON files as saved on ATB server 2024-07-19 10:34:01 +02:00
Siegfried Siegert
518817f400 Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335 2024-07-19 09:58:23 +02:00
Siegfried Siegert
5c0fb02903 Add PTU5 configuration 2024-07-19 09:57:47 +02:00
Gerhard Hoffmann
251ef75027 Add tariff for Yellow Zone 2024-07-18 15:36:42 +02:00
Gerhard Hoffmann
6475afa172 Provide empty file as start 2024-07-17 14:47:32 +02:00
Gerhard Hoffmann
2808d340bc Merge branch 'master' of https://ptu-config.atb-comm.de/ATB/customer_335 2024-07-03 13:08:51 +02:00
Gerhard Hoffmann
17357ab472 Sync with zg1/zone1 2024-07-03 13:07:31 +02:00
13 changed files with 1732 additions and 2375 deletions
Expand all files Collapse all files

8
etc/psa_config/DC2C_print03.json Normal file → Executable file
View File

@@ -2,14 +2,8 @@
"title":"DC2C_pri03", "title":"DC2C_pri03",
"Project":"Klaipeda", "Project":"Klaipeda",
"Version":"1.1.3-2024-08-08", "Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00", "styl":"size 00",
"styl":"align c", "text":"Sumokėta:",
"feed":"margin02",
"feed":"rim02",
"styl":"size 00",
"text":"Sumokėta grynais:",
"vari":"Dynamic02", "vari":"Dynamic02",
"styl":"size 21", "styl":"size 21",
"text":"Raudonoji zona", "text":"Raudonoji zona",

40
etc/psa_config/DC2C_print03_red.json Executable file
View File

@@ -0,0 +1,40 @@
{
"title":"DC2C_pri03",
"Project":"Klaipeda",
"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 grynais:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Raudonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 1,50Eur/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

39
etc/psa_config/DC2C_print03_yellow.json Executable file
View File

@@ -0,0 +1,39 @@
{
"title":"DC2C_pri03",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"text":"Sumokėta grynais:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Geltonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 60 ct/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

7
etc/psa_config/DC2C_print07.json Normal file → Executable file
View File

@@ -2,13 +2,8 @@
"title":"DC2C_pri07", "title":"DC2C_pri07",
"Project":"Klaipeda", "Project":"Klaipeda",
"Version":"1.1.3-2024-08-08", "Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00", "styl":"size 00",
"styl":"align c", "text":"Sumokėta:",
"feed":"margin02",
"feed":"rim02",
"text":"Sumokėta kortele:",
"vari":"Dynamic02", "vari":"Dynamic02",
"styl":"size 21", "styl":"size 21",
"text":"Raudonoji zona", "text":"Raudonoji zona",

39
etc/psa_config/DC2C_print07_red.json Executable file
View File

@@ -0,0 +1,39 @@
{
"title":"DC2C_pri07",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"text":"Sumokėta kortele:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Raudonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 1,50Eur/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

39
etc/psa_config/DC2C_print07_yellow.json Executable file
View File

@@ -0,0 +1,39 @@
{
"title":"DC2C_pri07",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"styl":"size 00",
"text":"Sumokėta kortele:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Geltonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 60 ct/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

235
etc/psa_tariff/tariff01.json
View File

@@ -1,6 +1,6 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "2.1.0-2024-04-23T12:36:12+02:00", "Version" : "2.1.0-2024-12-13T12:36:12+02:00",
"Info" : "Red Zone (center)", "Info" : "Red Zone (center)",
"Currency": [ "Currency": [
{ {
@@ -37,13 +37,13 @@
"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,
@@ -2206,14 +2206,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2232,15 +2226,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2251,15 +2238,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -2289,14 +2270,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2315,15 +2290,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2334,15 +2302,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -2378,8 +2340,8 @@
}, },
{ {
"prepaid_id" : 3, "prepaid_id" : 3,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2405,8 +2367,8 @@
{ {
"carry_over_id" : 3, "carry_over_id" : 3,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2423,9 +2385,9 @@
}, },
{ {
"service_id" : 2, "service_id" : 2,
"service_duration": 480, "service_duration": 360,
"service_start" : "14:00:00", "service_start" : "14:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2453,14 +2415,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2479,15 +2435,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2498,15 +2447,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -2536,14 +2479,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2562,15 +2499,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2581,15 +2511,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -2619,14 +2543,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2645,15 +2563,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2664,15 +2575,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -2702,14 +2607,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2728,15 +2627,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2747,15 +2639,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -2785,14 +2671,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "12:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2811,15 +2691,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "12:00:00", "carry_over_start" : "20: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -2830,15 +2703,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "20:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }

727
etc/psa_tariff/tariff02.json
View File

@@ -1,6 +1,6 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "2.0.0-2025-04-23T09:32:12+02:00", "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
"Info" : "Yellow Zone (plus)", "Info" : "Yellow Zone (plus)",
"Currency": [ "Currency": [
{ {
@@ -37,13 +37,13 @@
"TimeRange" : [ "TimeRange" : [
{ {
"time_range_id": 1, "time_range_id": 1,
"time_range_from": "22:00:00", "time_range_from": "18: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": "18:00:00"
}, },
{ {
"time_range_id": 3, "time_range_id": 3,
@@ -986,6 +986,45 @@
} }
], ],
"Monday" : [{ "Monday" : [{
"2025-04-21" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1006,14 +1045,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 360,
"prepaid_start" : "12:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -1032,15 +1065,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 360,
"carry_over_start" : "12:00:00", "carry_over_start" : "18: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -1051,15 +1077,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "18:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -1069,6 +1089,84 @@
} }
}], }],
"Tuesday" : [{ "Tuesday" : [{
"2024-12-24" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-03-11" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1089,14 +1187,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 360,
"prepaid_start" : "12:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -1115,15 +1207,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 360,
"carry_over_start" : "12:00:00", "carry_over_start" : "18: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -1134,15 +1219,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "18:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -1152,6 +1231,84 @@
} }
}], }],
"Wednesday" : [{ "Wednesday" : [{
"2024-12-25" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-01-01" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1172,14 +1329,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 360,
"prepaid_start" : "12:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -1198,15 +1349,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 360,
"carry_over_start" : "12:00:00", "carry_over_start" : "18: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -1217,15 +1361,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "18:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -1235,6 +1373,84 @@
} }
}], }],
"Thursday" : [{ "Thursday" : [{
"2024-12-26" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-05-01" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1255,14 +1471,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 360,
"prepaid_start" : "12:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -1281,15 +1491,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 360,
"carry_over_start" : "12:00:00", "carry_over_start" : "18: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -1300,15 +1503,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "18:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
@@ -1318,6 +1515,45 @@
} }
}], }],
"Friday" : [{ "Friday" : [{
"2024-11-01" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1338,14 +1574,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 360,
"prepaid_start" : "12:00:00", "prepaid_start" : "18:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 120,
"prepaid_start" : "22:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -1364,15 +1594,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 360,
"carry_over_start" : "12:00:00", "carry_over_start" : "18: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" "carry_over_end": "24:00:00"
} }
] ]
@@ -1383,31 +1606,25 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 600,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "12:00:00" "service_end": "18:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22:00:00"
} }
] ]
} }
], ],
"out_of_service_settings" : [ "out_of_service_settings" : [
] ]
} }
}], }],
"Saturday" : [{ "Saturday" : [{
"default" : { "2024-11-02" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 30, "min_time" : 0,
"max_time" : 840, "max_time" : 0,
"max_price": 840, "max_price": 0,
"min_price": 30 "min_price": 0
} }
], ],
"prepaid_settings" : [ "prepaid_settings" : [
@@ -1415,20 +1632,8 @@
"prepaid_ranges" : [ "prepaid_ranges" : [
{ {
"prepaid_id" : 1, "prepaid_id" : 1,
"prepaid_duration": 480, "prepaid_duration": 1440,
"prepaid_start" : "00:00:00", "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" "prepaid_end": "24:00:00"
} }
] ]
@@ -1440,57 +1645,66 @@
{ {
"carry_over_id" : 1, "carry_over_id" : 1,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 480, "carry_over_duration": 1440,
"carry_over_start" : "00:00:00", "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" "carry_over_end": "24:00:00"
} }
] ]
} }
], ],
"service_settings" : [ "service_settings" : [
],
"out_of_service_settings" : [
]
},
"default" : {
"payment_settings" : [
{ {
"service_ranges" : [ "min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"prepaid_settings" : [
{
"prepaid_ranges" : [
{ {
"service_id" : 1, "prepaid_id" : 1,
"service_duration": 240, "prepaid_duration": 1440,
"service_start" : "08:00:00", "prepaid_start" : "00:00:00",
"service_end": "12:00:00" "prepaid_end": "24:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22: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" : [ "out_of_service_settings" : [
] ]
} }
}], }],
"Sunday" : [{ "Sunday" : [{
"default" : { "2025-02-16" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 30, "min_time" : 0,
"max_time" : 840, "max_time" : 0,
"max_price": 840, "max_price": 0,
"min_price": 30 "min_price": 0
} }
], ],
"prepaid_settings" : [ "prepaid_settings" : [
@@ -1498,20 +1712,8 @@
"prepaid_ranges" : [ "prepaid_ranges" : [
{ {
"prepaid_id" : 1, "prepaid_id" : 1,
"prepaid_duration": 480, "prepaid_duration": 1440,
"prepaid_start" : "00:00:00", "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" "prepaid_end": "24:00:00"
} }
] ]
@@ -1523,47 +1725,134 @@
{ {
"carry_over_id" : 1, "carry_over_id" : 1,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 480, "carry_over_duration": 1440,
"carry_over_start" : "00:00:00", "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" "carry_over_end": "24:00:00"
} }
] ]
} }
], ],
"service_settings" : [ "service_settings" : [
],
"out_of_service_settings" : [
]
},
"2025-04-20" : {
"payment_settings" : [
{ {
"service_ranges" : [ "min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"prepaid_settings" : [
{
"prepaid_ranges" : [
{ {
"service_id" : 1, "prepaid_id" : 1,
"service_duration": 240, "prepaid_duration": 1440,
"service_start" : "08:00:00", "prepaid_start" : "00:00:00",
"service_end": "12:00:00" "prepaid_end": "24:00:00"
},
{
"service_id" : 2,
"service_duration": 480,
"service_start" : "14:00:00",
"service_end": "22: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" : [ "out_of_service_settings" : [
] ]
},
"2025-05-04" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
} }
}] }]
} }

966
etc/psa_tariff/tariff03.json
View File

File diff suppressed because it is too large Load Diff

528
etc/psa_tariff/tariff04.json
View File

@@ -1,6 +1,6 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "2.0.0-2025-04-23T09:32:12+02:00", "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
"Info" : "Yellow Zone (center)", "Info" : "Yellow Zone (center)",
"Currency": [ "Currency": [
{ {
@@ -986,71 +986,7 @@
} }
], ],
"Monday" : [{ "Monday" : [{
"default" : { "2025-04-21" : {
"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": 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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_start" : "08:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
}
}],
"Tuesday" : [{
"2025-06-24" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 0, "min_time" : 0,
@@ -1149,10 +1085,230 @@
} }
], ],
"out_of_service_settings" : [ "out_of_service_settings" : [
] ]
}
}],
"Tuesday" : [{
"2024-12-24" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-03-11" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"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": 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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_start" : "08:00:00",
"service_end": "18:00:00"
}
]
}
],
"out_of_service_settings" : [
]
} }
}], }],
"Wednesday" : [{ "Wednesday" : [{
"2024-12-25" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-01-01" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1217,6 +1373,45 @@
} }
}], }],
"Thursday" : [{ "Thursday" : [{
"2024-12-26" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-05-01" : { "2025-05-01" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1254,7 +1449,7 @@
"service_settings" : [ "service_settings" : [
], ],
"out_of_service_settings" : [ "out_of_service_settings" : [
] ]
}, },
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
@@ -1320,7 +1515,7 @@
} }
}], }],
"Friday" : [{ "Friday" : [{
"2025-08-15" : { "2024-11-01" : {
"payment_settings" : [ "payment_settings" : [
{ {
"min_time" : 0, "min_time" : 0,
@@ -1423,6 +1618,45 @@
} }
}], }],
"Saturday" : [{ "Saturday" : [{
"2024-11-02" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1464,6 +1698,84 @@
} }
}], }],
"Sunday" : [{ "Sunday" : [{
"2025-02-16" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-04-20" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-05-04" : { "2025-05-04" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -1503,84 +1815,6 @@
"out_of_service_settings" : [ "out_of_service_settings" : [
] ]
}, },
"2025-06-01" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"2025-07-06" : {
"payment_settings" : [
{
"min_time" : 0,
"max_time" : 0,
"max_price": 0,
"min_price": 0
}
],
"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" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {

90
etc/psa_tariff/tariff05.json
View File

@@ -1,6 +1,6 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "2.1.0-2025-04-23T13:36:12+02:00", "Version" : "2.1.0-2024-12-16T13:36:12+02:00",
"Info" : "Red Zone (center)", "Info" : "Red Zone (center)",
"Currency": [ "Currency": [
{ {
@@ -37,13 +37,13 @@
"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,
@@ -2206,8 +2206,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2226,8 +2226,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2238,9 +2238,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2270,8 +2270,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2290,8 +2290,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2302,9 +2302,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2334,8 +2334,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2354,8 +2354,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2366,9 +2366,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2398,8 +2398,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2418,8 +2418,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2430,9 +2430,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2462,8 +2462,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2482,8 +2482,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2494,9 +2494,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2526,8 +2526,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2546,8 +2546,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2558,9 +2558,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }
@@ -2590,8 +2590,8 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120, "prepaid_duration": 240,
"prepaid_start" : "22:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
} }
] ]
@@ -2610,8 +2610,8 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "carry_over_if": "always",
"carry_over_duration": 120, "carry_over_duration": 240,
"carry_over_start" : "22:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
} }
] ]
@@ -2622,9 +2622,9 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 840, "service_duration": 720,
"service_start" : "08:00:00", "service_start" : "08:00:00",
"service_end": "22:00:00" "service_end": "20:00:00"
} }
] ]
} }

1387
etc/psa_tariff/tariff06.json
View File

File diff suppressed because it is too large Load Diff

2
etc/psa_update/opkg_commands
View File

@@ -16,7 +16,7 @@ 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 ptu5-systemcontroller
opkg --cache /var/cache/opkg --download-only install ptu-package-versions 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 install wbdw
opkg --cache /var/cache/opkg --download-only upgrade ptu5-sysconfig opkg --cach /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 libmobilisis-calc