Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1

.githooks/post-checkout

@@ -0,0 +1,4 @@
+echo "POST-CHECKOUT"
+echo "PREV-HEAD=$1"
+echo "CURR-HEAD=$2"
+echo "BRANCH-CHECKOUT=$3"

.gitignore

@@ -1,16 +1,27 @@
+# First, ignore everything
 *
-
-## Except
+# Now, whitelist anything that's a directory
+!*/
+# And all the file types you're interested in
+!.gitignore
+!.githooks/post-merge
+!.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
-!/etc/*.ini
-!/etc/atb/*.ini
-!/etc/psa_config/*
-!/etc/psa_update/*
-!/etc/psa_tariff/*
-!/etc/dc/dc2c.hex
+!**/.githooks/post-checkout
 
-!/opt/app/ATBAPP/*.ini
-!/opt/app/sysconfig/*.ini
-!/opt/app/ISMASMgr/*.ini
+## Except
+!etc/atb/*
+!etc/psa_config/*
+!etc/psa_update/*
+!etc/psa_tariff/*
+!etc/dc/*.hex
+!etc/dc/*.bin
+!*/etc/*.ini
+!*/etc/atb/*
+!*/etc/psa_config/*
+!*/etc/psa_update/*
+!*/etc/psa_tariff/*
+!*/etc/dc/*.hex
+!*/etc/dc/*.bin
 

etc/psa_config/DC2C_print01.json

@@ -1,28 +1,38 @@
 {
 "title":"DC2C_pri01",
-"project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
-"styl":"bold on",
-"text":"Parkingticket ",
-"styl":"bold off",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.02",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
 "feed":"nl",
-"text":"Parkingticket ",
-"styl":"under on",
-"text":"Parkingticket ",
-"styl":"under off",
+"text":"      Nyugta",
 "feed":"nl",
-"text":"Parkingticket ",
-"styl":"latin on",
-"text":"Parkingticket ",
-"styl":"latin off",
+"text":"Kérjük az elsö szélvédö",
 "feed":"nl",
-"text":"Parkingticket ",
-"styl":"font 09",
-"text":"Park ",
-"styl":"font 16",
-"text":"Park ",
+"text":"mögé jól láthatóan", 
 "feed":"nl",
-"":""
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
 }
 
 

etc/psa_config/DC2C_print02.json

@@ -1,5 +1,37 @@
-{
-"title":"DC2C_pri02",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri02",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.01",
+
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"6720 Szeged ",
+"feed":"nl",
+"text":"Zrínyi utca 4-8",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06", 
+"feed":"nl",
+"text":"A jegy ára az ÁFA-t", 
+"feed":"nl",
+"text":"     tartalmazza!",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+}
+
+

etc/psa_config/DC2C_print03.json

@@ -1,5 +1,22 @@
-{
-"title":"DC2C_pri03",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri03",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel. ",
+"feed":"nl",
+"text":"Használja bankkártyáját ",
+"feed":"nl",
+"text":"  automatáinknál is!",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject",
+}
+
+

etc/psa_config/DC2C_print32.json

@@ -2,5 +2,5 @@
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
 "":"",
-"":"10001"
+"":"8:50 3.April"
 }