Update jsons-files as provided by Thomas

Tariff for Zone 2 (Yellow) in Kleipeda
Tariff for Zone 1 (Red) in Kleipeda
2024-08-08 10:29:14 +02:00 · 2024-08-01 17:22:10 +02:00 · 2024-08-01 17:08:12 +02:00 · 2024-07-19 10:36:01 +02:00 · 2024-07-19 10:29:11 +02:00 · 2024-07-19 10:07:06 +02:00
35 changed files with 3605 additions and 157 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@@ -0,0 +1,124 @@
+[COMMON]
+com_port_name=/dev/ttyS1
+com_baud_rate=9600
+lang1=lt_LT
+lang2=en_GB
+lang3=de_DE
+lang4=ru_RU
+lang5=
+
+defaultLanguage=1
+CharacterSet="ISO 8859-13"
+
+showInfoButton=false
+showHelpButton=false
+
+#useLanguage=[128+][64+][32+][16]
+useLanguage=240
+#usePayment=[128+][64+][32+][16]
+usePayment=96
+#useVehicle=[128+][64+][32+][16+][8]
+useVehicle=192
+#useProduct=[128+][64+][32+][16+][8]
+useProduct=192
+
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+logfile=/var/log/atbqt.log
+alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
+
+feature_Log=off
+feature_TouchFeedback=off
+feature_StartButton=on
+feature_selfOOO=off
+feature_ShowParkingTime=off
+
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+
+touch_feedback_gpio=121
+touch_feedback_on_value=1
+touch_feedback_off_value=0
+
+#ooo_mode={useDisk|otherMachine}
+ooo_mode=otherMachine
+sellTimeout_time=60
+
+showInfoButton=false
+showHelpButton=false
+
+useAppStates=1
+statefile=/opt/app/ATBAPP/states/APP_States.xml
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,0"
+sc_35="0,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+
+[PLUGINS]
+CCPlugin=AsyncPOS_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+
+[IngenicoISelf_CCPlugin]
+debug=1
+PortName=/dev/ttymxc0
+ZVT=DE
+sleep=1
+sleepExtended=1
+Currency=HUF
+
+
+[TCP_CONTROL]
+enable=1
+
+
+[PAYMENT]
+currencySymbol=€
+currencyISOCode=EUR
+cashVariant=CoinsAndNotes
+paymentPointInTime=poa
+useDecimal=yes
+
+
+[MOBILISIS_CalculatePricePlugin]
+useDebug=1
+tariffFileName=/etc/psa_tariff/tariff01.json
+
+[ATBDeviceControllerPlugin]
+serialPort=ttymxc2
+printerEncoding="Windows-1252"
+printerLocale="de_DE"
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+debug=1
+IP=192.168.6.242
+Port=22000
+SSL=0
+ZVT=DE
+sleep=1
+printIntermediateStatus=1
+Password=277296
+NumberOfChars=37
+dcHours="0"
+
+[AsyncPOS_CCPlugin]
+APAK=8AC304380E0E476BA2558B75DB9E2516
+POSID=T-TPS-SELF2002in
+PortName=/dev/ttymxc0
+baudrate=19200
+dataBits=8
+dcHours=0
+debug=1
+parity=0
+sleep=0
+stopBits=1
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,18 +1,17 @@
 {	     
 "title":"DC2C_cash  ",
-"project":"Klaipeda",
-"version":"1.0.0-2024-06-28",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
-"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"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],
 "ExchangeRate":1,
 "TokenChannel":6,
 "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":19,
+"LocalTaxRate":21,
 "ForeignTaxRate":0,
 "Surcharge":0,	
 "Discount":0
 }
-#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],

--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,11 +1,11 @@
 {
 "title":"DC2C_device",
-"project":"Klaipeda",
-"Version":"1.0.0-2024-06-28",
+"Project":"Schoenau",
+"Version":"6.7.2-2024-06-17",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
-"solarPwr":0,
+"solarPwr":1,
 "modem":1,
 "creditCard":1,
 "escrow":1,
@@ -15,16 +15,17 @@
 "vaultLock":0,
 "autoAlarm":1,
 "autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
+"AccPrint":2,
+"DorPrint":0,
+"TokPrint":0,
 "CBwarnLev":1600,
 "CBerrLev":1900,
 "BattWarn":11800,
 "BattErr":11200,
-"foreign":1,
+"foreign":3,
 "refundPrint":1,
-"billWarnLev":400,
-"billFullLev":500,
+"billWarnLev":300,
+"billFullLev":380,
 "housing":1
+
 }
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,30 +1,23 @@
 {
 "title":"DC2C_pri01",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"styl":"font 10",
-"styl":"size 11",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"",
+"styl":"font 23",
+"styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"graf":"logo1",
-"text":"Klaipeda",
-"feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
+"text":"Privaloma įmoka - vietinė rinkliava.",
+"feed":"nl",
+"text":"Bilietą padėkite už priekinio stiklo",
+"feed":"nl",
+"text":"ant prietaisų skydelio, kad būtų",
+"feed":"nl",
+"text":"lengvai įskaitomi bilieto duomenys.",
 "feed":"nl",
 "feed":"nl",
-"styl":"size 00",
-"styl":"align l",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
+"text":"Galioja šia puse į viršų.",
 "feed":"nl"
 }

--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,15 +1,33 @@
 {
 "title":"DC2C_pri02",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
 "feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"text":"",
+"styl":"font 23",
+"text":"Automobilio valstybinis",
 "feed":"nl",
-"styl":"size 00"
+"text":" numeris:",
+"feed":"nl",
+"styl":"font 10",
+"styl":"size 22",
+"vari":"Dynamic01",
+"feed":"nl",
+"styl":"font 23",
+"styl":"size 00",
+"text":"Apmokėta iki:",
+"feed":"nl",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
+"text":" Data: ",
+"styl":"size 32",
+"vari":"Dynamic03",
+"styl":"size 00",
+"text":"Mokėjimo data ir laikas:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time long",
+"feed":"nl"
 }


--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,23 +1,24 @@
 {
 "title":"DC2C_pri03",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"size 00",
+"text":"Sumokėta:", 
+"vari":"Dynamic02",
+"styl":"size 21",
+"text":"Geltonoji zona",
+"feed":"nl",
+"styl":"size 10",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
 "feed":"nl",
-"vari":"location",
-"text":"Automat: ",
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Automato nr.:",
 "vari":"manu",
-"feed":"nl",
-"styl":"align c",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"eject"
+"feed":"nl"
 }


--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,6 +1,32 @@
 {
 "title":"DC2C_pri04",
-"project":"Klaipeda",
-"Version":"15.11.2023 01.01",
-"text":"";
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"Klaipėdos miesto",
+"feed":"nl",
+"text":"savivaldybė",
+"feed":"nl",
+"text":"Liepų g. 11, LT-92138",
+"feed":"nl",
+"text":" Klaipėda,",
+"feed":"nl",
+"text":"Įm.k. 188710823",
+"feed":"nl",
+"text":"Informacija tel.:",
+"feed":"nl",
+"text":" +370 800 12344 "
+"feed":"nl",
+"feed":"eject"
 }
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,30 +1,23 @@
 {
 "title":"DC2C_pri05",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"styl":"font 10",
-"styl":"size 11",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"",
+"styl":"font 23",
+"styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"graf":"logo1",
-"text":"Klaipeda",
-"feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
+"text":"Privaloma įmoka - vietinė rinkliava.",
+"feed":"nl",
+"text":"Bilietą padėkite už priekinio stiklo",
+"feed":"nl",
+"text":"ant prietaisų skydelio, kad būtų",
+"feed":"nl",
+"text":"lengvai įskaitomi bilieto duomenys.",
 "feed":"nl",
 "feed":"nl",
-"styl":"size 00",
-"styl":"align l",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
+"text":"Galioja šia puse į viršų.",
 "feed":"nl"
 }

--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,16 +1,33 @@
 {
 "title":"DC2C_pri06",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
 "feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"text":"",
+"styl":"font 23",
+"text":"Automobilio valstybinis",
 "feed":"nl",
-"styl":"size 00"
-
+"text":" numeris:",
+"feed":"nl",
+"styl":"font 10",
+"styl":"size 22",
+"vari":"Dynamic01",
+"feed":"nl",
+"styl":"font 23",
+"styl":"size 00",
+"text":"Apmokėta iki:",
+"feed":"nl",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
+"text":" Data: ",
+"styl":"size 32",
+"vari":"Dynamic03",
+"styl":"size 00",
+"text":"Mokėjimo data ir laikas:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time long",
+"feed":"nl"
 }


--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,23 +1,24 @@
 {
 "title":"DC2C_pri07",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"size 00",
+"text":"Sumokėta:", 
+"vari":"Dynamic02",
+"styl":"size 21",
+"text":"Geltonoji zona",
+"feed":"nl",
+"styl":"size 10",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
 "feed":"nl",
-"vari":"location",
-"text":"Automat: ",
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Automato nr.:",
 "vari":"manu",
-"feed":"nl",
-"styl":"align c",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"eject"
+"feed":"nl"
 }


--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,6 +1,32 @@
 {
 "title":"DC2C_pri08",
-"project":"Klaipeda",
-"Version":"15.11.2023 01.01",
-"text":"";
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"Klaipėdos miesto",
+"feed":"nl",
+"text":"savivaldybė",
+"feed":"nl",
+"text":"Liepų g. 11, LT-92138",
+"feed":"nl",
+"text":" Klaipėda,",
+"feed":"nl",
+"text":"Įm.k. 188710823",
+"feed":"nl",
+"text":"Informacija tel.:",
+"feed":"nl",
+"text":" +370 800 12344 "
+"feed":"nl",
+"feed":"eject"
 }
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri09",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri10",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri11",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri12",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri13",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri14",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri15",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri16",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri17",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri18",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri19",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri20",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print21.json
+++ b/etc/psa_config/DC2C_print21.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri21",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri22",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print23.json
+++ b/etc/psa_config/DC2C_print23.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri23",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
@@ -0,0 +1,32 @@
+{
+"title":"DC2C_pri24",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"",
+"styl":"font 23",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Privaloma įmoka - vietinė rinkliava.",
+"feed":"nl",
+"text":"Vietinė rinkliava",
+"feed":"nl",
+"text":"pagal pranesima Nr.",
+"feed":"nl",
+"styl":"size 21",
+"vari":"Dynamic08",
+"styl":"size 00"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -0,0 +1,36 @@
+{
+"title":"DC2C_pri25",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"size 00",
+"feed":"nl",
+"text":"Automobilio valstybinis numeris:",
+"feed":"nl",
+"styl":"font 10",
+"styl":"size 21",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Sumokėta:", 
+"feed":"nl",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Mokejimo data ir laikas:", 
+"feed":"nl",
+"styl":"size 11",
+"vari":"date us",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print26.json
+++ b/etc/psa_config/DC2C_print26.json
@@ -0,0 +1,37 @@
+{
+"title":"DC2C_pri26",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"size 00",
+"text":"Parkomato numeris:", 
+"vari":"manu",	
+"feed":"nl",
+"text":"Klaipėdos miesto",
+"feed":"nl",
+"text":"savivaldybė",
+"feed":"nl",
+"text":"Liepų g. 11, LT-92138",
+"feed":"nl",
+"text":" Klaipėda,",
+"feed":"nl",
+"text":"Įm.k. 188710823",
+"feed":"nl",
+"text":"Informacija tel.:",
+"feed":"nl",
+"text":" +370 800 12344 "
+"feed":"nl",
+"feed":"eject"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print27.json
+++ b/etc/psa_config/DC2C_print27.json
@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri27",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri31",
 "project":"door close print",
-"Version":"15.11.2023 00001",
+"Version":"27.06.2024 00001",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri32",
 "project":"refund reciept",
-"Version":"15.11.2023 00001",
+"Version":"27.06.2024 00001",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
  "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
-  "Info"    : "",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Info"    : "Red Zone",
  "Currency": [
    {
      "pcu_id": 2,
@@ -46,6 +46,163 @@
      "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,
@@ -60,7 +217,11 @@
      "comment_pop_max_time": "840mins = 14h -> 21 euros",
      "pop_min_price": 30,
      "pop_max_price": 2100,
+      "pop_plus_steps": 10,
+      "pop_minus_steps": 1,
      "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,
@@ -69,6 +230,11 @@
    }
  ],
  "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
    {
        "pra_payment_option_id": 1049,
        "pra_payment_unit_id": 1,
@@ -1121,6 +1287,11 @@
    }
  ],
  "Duration": [
+    {
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
+    },
    {
 	"pun_duration": 4,
 	"pun_id": 1,
@@ -2216,7 +2387,7 @@
      "pwd_time_to": "22:00:00"
    },
    {
-      "pwd_id": 626,
+      "pwd_id": 627,
      "pwd_period_week_day_id": 36,
      "pwd_period_day_in_week_id": 7,
      "pwd_time_from": "08:00:00",
@@ -2225,12 +2396,20 @@
  ],
  "PeriodYear": [
    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
+      "pye_id": 1,
+      "pye_label": "May - September",
+      "pye_start_month": 5,
      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
+      "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
    }
  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,6 +1,6 @@
 {
  "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
  "Info"    : "Yellow Zone",
  "Currency": [
    {
@@ -60,7 +60,11 @@
      "comment_pop_max_time": "840mins = 14h -> 21 euros",
      "pop_min_price": 30,
      "pop_max_price": 840,
+      "pop_plus_steps": 10,
+      "pop_minus_steps": 1,
      "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,
@@ -68,7 +72,169 @@
      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
    }
  ],
+  "Prepaid": [
+    {
+        "prepaid_id": 1,
+        "prepaid_anytime": true,
+        "prepaid_never": false
+    },
+    {
+        "prepaid_id": 2,
+        "prepaid_anytime": false,
+        "prepaid_never": true
+    },
+    {
+        "prepaid_id": 3,
+        "prepaid_anytime": false,
+        "prepaid_never": false,
+        "prepaid_static_start": "22:00:00",
+        "prepaid_static_end": "08:00:00"
+    }
+  ],
+  "CarryOver": [
+    {
+      "carry_over_id" : 1,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    },
+    {
+      "carry_over_id" : 2,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    }
+  ],
  "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
    {
        "pra_payment_option_id": 1049,
        "pra_payment_unit_id": 1,
@@ -491,6 +657,11 @@
    }
  ],
  "Duration": [
+    {
+	     "pun_duration": 0,
+	     "pun_id": 0,
+	     "pun_label": "0 min"
+    },
    {
        "pun_duration": 10,
        "pun_id": 1,
@@ -965,12 +1136,20 @@
  ],
  "PeriodYear": [
    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
+      "pye_id": 1,
+      "pye_label": "May - September",
+      "pye_start_month": 5,
      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
+      "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
    }
  ]
 }
Author	SHA1	Message	Date
Gerhard Hoffmann	f78e84624a	Update jsons-files as provided by Thomas	2024-08-08 10:29:14 +02:00
Gerhard Hoffmann	079d0f4e7e	Tariff for Zone 2 (Yellow) in Kleipeda	2024-08-01 17:22:10 +02:00
Gerhard Hoffmann	f21099f036	Tariff for Zone 1 (Red) in Kleipeda	2024-08-01 17:08:12 +02:00
Gerhard Hoffmann	0085494514	Add atbapp to sync with zone1 branch	2024-07-19 10:36:01 +02:00
Gerhard Hoffmann	f050c5657e	Add JSON files as saved on ATB server	2024-07-19 10:29:11 +02:00
Gerhard Hoffmann	a01f7b6647	Added Red-Zone as Info	2024-07-19 10:07:06 +02:00