Fix: portnumber for ingenico

Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_747
New logos (Dennis)
2024-07-15 16:31:51 +02:00 · 2024-07-15 16:30:58 +02:00 · 2024-07-11 08:42:01 +02:00 · 2024-06-13 09:06:56 +02:00 · 2024-06-13 08:55:43 +02:00 · 2024-06-13 08:53:24 +02:00
19 changed files with 179 additions and 12 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@@ -90,7 +90,7 @@ CurrencyCode=EUR
 IP=192.168.6.242
 NumberOfChars=37
 Password=835322
-Port=22000
+Port=20007
 SSL=0
 ZVT=DE
 dcHours=0
--- a/etc/psa_config/DC2C_conf1.json
+++ b/etc/psa_config/DC2C_conf1.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Pernegg",
+"version":"02.05.2024 00001",
+"custNum":747,
+"machNum":1,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"Standort 1"
+}
+
--- a/etc/psa_config/DC2C_conf2.json
+++ b/etc/psa_config/DC2C_conf2.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Pernegg",
+"version":"02.05.2024 00001",
+"custNum":747,
+"machNum":2,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"Standort 2"
+}
+
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,11 +1,12 @@
 {
 "title":"DC2C_pri01",
 "project":"Pernegg",
-"version":"02.05.2024 00001",
+"Version":"10.07.2024 00001",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
+"graf":"logo1",
 "feed":"rim02",
 "text":"PARKTICKET",
 "styl":"size 00",
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri02",
 "project":"Pernegg",
-"version":"02.05.2024 00001",
+"Version":"02.05.2024 00001",
 "issued":"13.11.2023 01.01",
 "text":"Standort: ",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri03",
 "project":"Pernegg",
-"version":"02.05.2024 00001",
+"Version":"02.05.2024 00001",
 "feed":"nl",
 "styl":"size 00",
 "text":"Automat: ",
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,6 +1,6 @@
 {
 "title":"DC2C_pri04",
 "project":"Pernegg",
-"version":"02.05.2024 00001",
+"Version":"02.05.2024 00001",
 "text":""
-}
+}
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -0,0 +1,41 @@
+{
+"title":"DC2C_pri13",
+"project":"Pernegg",
+"Version":"10.07.2024 00001",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"graf":"logo1",
+"feed":"rim02",
+"text":"PARKTICKET",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkende: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -0,0 +1,28 @@
+{
+"title":"DC2C_pri14",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"feed":"nl",
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -0,0 +1,33 @@
+{
+"title":"DC2C_pri15",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"feed":"nl",
+"text":"Ort: ",
+"vari":"location",	
+"feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri16",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"text":""
+}
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri17",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"text":""
+}
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri18",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"text":""
+}
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri19",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"text":""
+}
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri20",
+"project":"Pernegg",
+"Version":"02.05.2024 00001",
+"text":""
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri31",
 "project":"Pernegg",
-"version":"02.05.2024 00001",
+"Version":"02.05.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":"Pernegg",
-"version":"02.05.2024 00001",
+"Version":"02.05.2024 00001",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -161,11 +161,21 @@
      "tariff_product_to_in_minutes_from_start": 0
    },
    {
-      "tariff_product_id": 8,
-      "tariff_product_permit_type": 8,
-      "tariff_product_price": 0,
-      "tariff_product_name": "INVALID",
+      "tariff_product_id": 1,
+      "tariff_product_permit_type": 1,
+      "tariff_product_price": 600,
+      "tariff_product_name": "DAY_TICKET",
      "tariff_product_start": "17:00:00",
+      "tariff_product_end": "23:59:59",
+      "tariff_product_from_in_minutes_from_start": 0,
+      "tariff_product_to_in_minutes_from_start": 0
+    },
+    {
+      "tariff_product_id": 1,
+      "tariff_product_permit_type": 1,
+      "tariff_product_price": 600,
+      "tariff_product_name": "DAY_TICKET",
+      "tariff_product_start": "00:00:00",
      "tariff_product_end": "06:00:00",
      "tariff_product_from_in_minutes_from_start": 0,
      "tariff_product_to_in_minutes_from_start": 0
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
Author	SHA1	Message	Date
Siegfried Siegert	2840749da3	Fix: portnumber for ingenico	2024-07-15 16:31:51 +02:00
Siegfried Siegert	e2bf587e1d	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_747	2024-07-15 16:30:58 +02:00
Gerhard Hoffmann	d4ae6e5791	New logos (Dennis)	2024-07-11 08:42:01 +02:00
Siegfried Siegert	a0f0d613d0	Merge branch 'zg1/zone1'	2024-06-13 09:06:56 +02:00
Siegfried Siegert	c36b251faa	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_747	2024-06-13 08:55:43 +02:00
Siegfried Siegert	557f43dc30	Add DC configuration files (aka "json-files")	2024-06-13 08:53:24 +02:00
Siegfried Siegert	4dd310c8d8	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_747 into zg1/zone1	2024-06-12 14:43:02 +02:00
Gerhard Hoffmann	98f4f311ea	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_747 into zg1/zone1	2024-05-17 08:24:37 +02:00
Gerhard Hoffmann	b0b3d24fa2	Add new products, so it is possible to buy a ticket for the next day. Price: 600.	2024-05-17 08:24:07 +02:00
Gerhard Hoffmann	95ff0df6a3	Add new products, so it is possible to buy a ticket for the next day. Price: 600.	2024-05-17 08:21:35 +02:00
Gerhard Hoffmann	4be8119809	Add JSON files as provided by Thomas	2024-05-02 15:25:48 +02:00
Gerhard Hoffmann	0d7d697fd2	deleted: wrong directory structure	2024-05-02 10:15:19 +02:00
Gerhard Hoffmann	6ce8bc8516	Provide dummy opkg-file	2024-05-02 10:14:12 +02:00
Gerhard Hoffmann	1b4e13f070	Minor: add comment	2024-05-02 10:06:03 +02:00
Gerhard Hoffmann	54e71bd9d6	deleted -> wrong parent directory	2024-05-02 10:02:53 +02:00
Gerhard Hoffmann	9cb28489b1	first draft for pernegg-an-der-mur	2024-04-16 11:58:38 +02:00
Gerhard Hoffmann	babc61df9d	start tariff file	2024-04-11 12:06:09 +02:00