From 95c2500bdbb6297390af67f07e3454f4ca554c2f Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 21 Aug 2024 17:56:53 +0200
Subject: [PATCH 01/16] Add settinge time-step-config and pop-allow-overpay

---
 etc/psa_tariff/tariff01.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index 25fb9c6..b61ea58 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -219,6 +219,9 @@
       "pop_max_price": 2100,
       "pop_plus_steps": 10,
       "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
       "pop_carry_over": 1,
       "pop_carry_over_option_id": 1,
       "pop_prepaid_option_id" : 3,

From 2702a713438618d3db2df1a71aaafac5c770fb60 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 21 Aug 2024 18:00:10 +0200
Subject: [PATCH 02/16] Add settinge time-step-config and pop-allow-overpay

---
 etc/psa_tariff/tariff02.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 67a579f..14180c6 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -62,6 +62,9 @@
       "pop_max_price": 840,
       "pop_plus_steps": 10,
       "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
       "pop_carry_over": 1,
       "pop_carry_over_option_id": 1,
       "pop_prepaid_option_id" : 3,

From 56852fc116e22194370481ea0645f2fb2a498dff Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 22 Aug 2024 08:27:31 +0200
Subject: [PATCH 03/16] smd-2024.08.20 only with CP1257

---
 etc/psa_config/DC2C_device.json  | 6 +++---
 etc/psa_config/DC2C_print01.json | 1 +
 etc/psa_config/DC2C_print02.json | 3 ---
 etc/psa_config/DC2C_print05.json | 1 +
 etc/psa_config/DC2C_print06.json | 3 ---
 etc/psa_config/DC2C_print24.json | 0
 etc/psa_config/DC2C_print25.json | 0
 etc/psa_config/DC2C_print26.json | 0
 8 files changed, 5 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 etc/psa_config/DC2C_print24.json
 mode change 100644 => 100755 etc/psa_config/DC2C_print25.json
 mode change 100644 => 100755 etc/psa_config/DC2C_print26.json

diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
index 1b106df..4623492 100755
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
-"Project":"Schoenau",
-"Version":"6.7.2-2024-06-17",
+"Project":"Klaipeda",
+"Version":"7.2.2-2024-08-20",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@@ -22,7 +22,7 @@
 "CBerrLev":1900,
 "BattWarn":11800,
 "BattErr":11200,
-"foreign":3,
+"foreign":5,
 "refundPrint":1,
 "billWarnLev":300,
 "billFullLev":380,
diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json
index 7e8351e..37a4077 100755
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -4,6 +4,7 @@
 "Version":"1.1.3-2024-08-08",
 "text":"",
 "styl":"font 23",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json
index 03219c0..1237711 100755
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -3,16 +3,13 @@
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
 "feed":"nl",
-"styl":"font 23",
 "text":"Automobilio valstybinis",
 "feed":"nl",
 "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",
diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json
index 1d04ac2..8bfc29d 100755
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -4,6 +4,7 @@
 "Version":"1.1.3-2024-08-08",
 "text":"",
 "styl":"font 23",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json
index 2906112..a9ee3da 100755
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -3,16 +3,13 @@
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
 "feed":"nl",
-"styl":"font 23",
 "text":"Automobilio valstybinis",
 "feed":"nl",
 "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",
diff --git a/etc/psa_config/DC2C_print24.json b/etc/psa_config/DC2C_print24.json
old mode 100644
new mode 100755
diff --git a/etc/psa_config/DC2C_print25.json b/etc/psa_config/DC2C_print25.json
old mode 100644
new mode 100755
diff --git a/etc/psa_config/DC2C_print26.json b/etc/psa_config/DC2C_print26.json
old mode 100644
new mode 100755

From 943c62a25aa9e411e887d9a293c0d08de95809ce Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 22 Aug 2024 13:25:37 +0200
Subject: [PATCH 04/16] checking new file 22.08.2024

---
 etc/psa_config/DC2C_device.json         | 7 +++----
 etc/psa_config/DC2C_print03_red.json    | 0
 etc/psa_config/DC2C_print03_yellow.json | 0
 etc/psa_config/DC2C_print07_red.json    | 0
 etc/psa_config/DC2C_print07_yellow.json | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 etc/psa_config/DC2C_print03_red.json
 mode change 100644 => 100755 etc/psa_config/DC2C_print03_yellow.json
 mode change 100644 => 100755 etc/psa_config/DC2C_print07_red.json
 mode change 100644 => 100755 etc/psa_config/DC2C_print07_yellow.json

diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
index 4623492..681bbaf 100755
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
 "Project":"Klaipeda",
-"Version":"7.2.2-2024-08-20",
+"Version":"7.2.3-2024-08-22",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@@ -15,8 +15,8 @@
 "vaultLock":0,
 "autoAlarm":1,
 "autoOpen":1,
-"AccPrint":2,
-"DorPrint":0,
+"AccPrint":1,
+"DorPrint":1,
 "TokPrint":0,
 "CBwarnLev":1600,
 "CBerrLev":1900,
@@ -27,5 +27,4 @@
 "billWarnLev":300,
 "billFullLev":380,
 "housing":1
-
 }
diff --git a/etc/psa_config/DC2C_print03_red.json b/etc/psa_config/DC2C_print03_red.json
old mode 100644
new mode 100755
diff --git a/etc/psa_config/DC2C_print03_yellow.json b/etc/psa_config/DC2C_print03_yellow.json
old mode 100644
new mode 100755
diff --git a/etc/psa_config/DC2C_print07_red.json b/etc/psa_config/DC2C_print07_red.json
old mode 100644
new mode 100755
diff --git a/etc/psa_config/DC2C_print07_yellow.json b/etc/psa_config/DC2C_print07_yellow.json
old mode 100644
new mode 100755

From 5976a30ea3b485f930a75671bcb701952a7dffc6 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 22 Aug 2024 15:33:42 +0200
Subject: [PATCH 05/16] updated by th.sax

---
 etc/psa_config/DC2C_print01.json |  4 ++--
 etc/psa_config/DC2C_print02.json | 12 ++++++------
 etc/psa_config/DC2C_print05.json |  4 ++--
 etc/psa_config/DC2C_print06.json | 12 ++++++------
 etc/psa_config/DC2C_print24.json |  5 +++--
 etc/psa_config/DC2C_print31.json | 33 ++++++++++++++++++++++++++------
 etc/psa_config/DC2C_print32.json | 30 ++++++++++++++---------------
 7 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json
index 37a4077..52310de 100755
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,9 +1,9 @@
 {
 "title":"DC2C_pri01",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "text":"",
-"styl":"font 23",
+"styl":"font 24",
 "styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json
index 1237711..6726711 100755
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri02",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "feed":"nl",
 "text":"Automobilio valstybinis",
 "feed":"nl",
@@ -9,17 +9,17 @@
 "feed":"nl",
 "styl":"size 22",
 "vari":"Dynamic01",
-"feed":"nl",
 "styl":"size 00",
+"feed":"nl",
 "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":"Data: ",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
 "text":"Mokėjimo data ir laikas:",
 "feed":"nl",
 "vari":"date us",	
diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json
index 8bfc29d..02bb8e6 100755
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,9 +1,9 @@
 {
 "title":"DC2C_pri05",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "text":"",
-"styl":"font 23",
+"styl":"font 24",
 "styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json
index a9ee3da..d05788a 100755
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri06",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "feed":"nl",
 "text":"Automobilio valstybinis",
 "feed":"nl",
@@ -9,17 +9,17 @@
 "feed":"nl",
 "styl":"size 22",
 "vari":"Dynamic01",
-"feed":"nl",
 "styl":"size 00",
+"feed":"nl",
 "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":"Data: ",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
 "text":"Mokėjimo data ir laikas:",
 "feed":"nl",
 "vari":"date us",	
diff --git a/etc/psa_config/DC2C_print24.json b/etc/psa_config/DC2C_print24.json
index c9f0e02..f4a8088 100755
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
@@ -1,9 +1,10 @@
 {
 "title":"DC2C_pri24",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "text":"",
-"styl":"font 23",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json
index 9b12887..6f16375 100755
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,20 +1,41 @@
 {
 "title":"DC2C_pri31",
-"project":"door close print",
-"Version":"27.06.2024 00001",
-"styl":"font 08",
-"styl":"size 10",
+"Project":"door close print",
+"Version":"6.7.2-2024-08-22",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"feed":"speed10",
 "styl":"size 11",
 "feed":"nl",
-"text":"Türöffnung um:",
+"text":"Door closed at:",
 "feed":"nl",
 "styl":"size 00",
 "vari":"date ge",
 "vari":"time long",
 "feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Place: ",
+"vari":"location",	
+"text":"Group: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"feed":"nl",
+"text":"**Automatentechnik ",
+"feed":"nl",
+"text":"   Baumann GmbH ***",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
 "feed":"eject"
 }
 
diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json
index 53efd5e..38d65b4 100755
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,40 +1,38 @@
 {
 "title":"DC2C_pri32",
-"project":"refund reciept",
-"Version":"27.06.2024 00001",
+"Project":"refund reciept",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
 "feed":"rim02",
 "feed":"speed10",
 "styl":"size 11",
-"text":"Ersatzbeleg",
+"text":"Refund Receipt",
 "feed":"nl",
 "styl":"size 00",
-"text":"Erstattungsbetrag: ",
+"text":"Amount to be refunded: ",
 "feed":"nl",
 "vari":"Dynamic07",
-"text":"€",
 "feed":"nl",
-"text":"KuNu: ",
+"styl":"size 00",
+"text":"Printed at:",
+"feed":"nl",
+"vari":"date us",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
 "vari":"cunu",	
-"text":"MaNu: ",
+"text":"MachineNr: ",
 "vari":"manu",	
-"text":"Ort: ",
+"text":"Place: ",
 "vari":"location",	
-"text":"Gruppe: ",
+"text":"Group: ",
 "vari":"group",	
 "text":"Zone: ",
 "vari":"zone",	
 "text":"Name: ",
 "vari":"alias",	
-"text":"Am: ",
-"vari":"date us",
-"text":"Um: ",
-"vari":"time long",
-"feed":"nl",
-"text":" * * * * * * * * ",
-"feed":"nl",
 "feed":"nl",
 "feed":"eject"
 }

From f5297f8fcf5e2bc698b221cb04d3f118b723cefd Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 27 Aug 2024 08:45:54 +0200
Subject: [PATCH 06/16] Set DorPrint=0

---
 etc/psa_config/DC2C_device.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
index 681bbaf..e99d4c9 100755
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -16,7 +16,7 @@
 "autoAlarm":1,
 "autoOpen":1,
 "AccPrint":1,
-"DorPrint":1,
+"DorPrint":0,
 "TokPrint":0,
 "CBwarnLev":1600,
 "CBerrLev":1900,

From b90be66e36f95acbb472fce85efb087ece7a64dc Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 27 Aug 2024 16:21:56 +0200
Subject: [PATCH 07/16] Update jsons as provided by T.Sax

---
 etc/psa_config/DC2C_device.json         | 7 ++++++-
 etc/psa_config/DC2C_print02.json        | 6 ++++++
 etc/psa_config/DC2C_print03_red.json    | 6 ++++++
 etc/psa_config/DC2C_print03_yellow.json | 5 +++++
 etc/psa_config/DC2C_print04.json        | 6 ++++++
 etc/psa_config/DC2C_print06.json        | 6 ++++++
 etc/psa_config/DC2C_print07_red.json    | 5 +++++
 etc/psa_config/DC2C_print07_yellow.json | 5 +++++
 etc/psa_config/DC2C_print08.json        | 6 ++++++
 etc/psa_config/DC2C_print25.json        | 5 +++++
 etc/psa_config/DC2C_print26.json        | 5 +++++
 11 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
index e99d4c9..11c4b03 100755
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -26,5 +26,10 @@
 "refundPrint":1,
 "billWarnLev":300,
 "billFullLev":380,
-"housing":1
+"housing":1,
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
 }
diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json
index 6726711..8a139fd 100755
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -2,6 +2,12 @@
 "title":"DC2C_pri02",
 "Project":"Klaipeda",
 "Version":"1.1.4-2024-08-22",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
 "text":"Automobilio valstybinis",
 "feed":"nl",
diff --git a/etc/psa_config/DC2C_print03_red.json b/etc/psa_config/DC2C_print03_red.json
index 08387dd..cca1bd4 100755
--- a/etc/psa_config/DC2C_print03_red.json
+++ b/etc/psa_config/DC2C_print03_red.json
@@ -2,6 +2,12 @@
 "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:", 
 "vari":"Dynamic02",
diff --git a/etc/psa_config/DC2C_print03_yellow.json b/etc/psa_config/DC2C_print03_yellow.json
index e6500f3..46573a2 100755
--- a/etc/psa_config/DC2C_print03_yellow.json
+++ b/etc/psa_config/DC2C_print03_yellow.json
@@ -2,7 +2,12 @@
 "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:", 
 "vari":"Dynamic02",
 "styl":"size 21",
diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json
index 41f56a1..e9e1610 100755
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -2,6 +2,12 @@
 "title":"DC2C_pri04",
 "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":"Klaipėdos miesto",
 "feed":"nl",
 "text":"savivaldybė",
diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json
index d05788a..d6e9c13 100755
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -2,6 +2,12 @@
 "title":"DC2C_pri06",
 "Project":"Klaipeda",
 "Version":"1.1.4-2024-08-22",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
 "text":"Automobilio valstybinis",
 "feed":"nl",
diff --git a/etc/psa_config/DC2C_print07_red.json b/etc/psa_config/DC2C_print07_red.json
index 369b12f..e4915aa 100755
--- a/etc/psa_config/DC2C_print07_red.json
+++ b/etc/psa_config/DC2C_print07_red.json
@@ -2,7 +2,12 @@
 "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:", 
 "vari":"Dynamic02",
 "styl":"size 21",
diff --git a/etc/psa_config/DC2C_print07_yellow.json b/etc/psa_config/DC2C_print07_yellow.json
index 0464cc8..2ec5a71 100755
--- a/etc/psa_config/DC2C_print07_yellow.json
+++ b/etc/psa_config/DC2C_print07_yellow.json
@@ -2,6 +2,11 @@
 "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:", 
 "vari":"Dynamic02",
diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json
index dadad81..9fdfe63 100755
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -2,6 +2,12 @@
 "title":"DC2C_pri08",
 "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":"Klaipėdos miesto",
 "feed":"nl",
 "text":"savivaldybė",
diff --git a/etc/psa_config/DC2C_print25.json b/etc/psa_config/DC2C_print25.json
index 1bf4ced..278c0f9 100755
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -2,7 +2,12 @@
 "title":"DC2C_pri25",
 "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",
 "feed":"nl",
 "text":"Automobilio valstybinis numeris:",
 "feed":"nl",
diff --git a/etc/psa_config/DC2C_print26.json b/etc/psa_config/DC2C_print26.json
index 6363858..dc0f5c0 100755
--- a/etc/psa_config/DC2C_print26.json
+++ b/etc/psa_config/DC2C_print26.json
@@ -2,6 +2,11 @@
 "title":"DC2C_pri26",
 "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":"Parkomato numeris:", 
 "vari":"manu",	

From 82e21f98f6884e0f2ec9e6867b40d4bc6ada2c09 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Fri, 30 Aug 2024 11:26:40 +0200
Subject: [PATCH 08/16] Add atb-plugin-calculateprice-mobilisis.

---
 etc/psa_update/opkg_commands | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands
index 3907e0a..391660a 100755
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -7,11 +7,13 @@
 opkg update
 opkg install prepare-update
 #
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
 opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
 opkg --cache /var/cache/opkg --download-only upgrade atbqt
 #
+opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
 opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
 opkg --cache /var/cache/opkg upgrade atb-dc-libraries
 opkg --cache /var/cache/opkg upgrade atb-plugin-dc

From 307503e402ce02e763e4c1ea724302472c66b8d0 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 5 Sep 2024 08:09:30 +0200
Subject: [PATCH 09/16] Updated as provided by t.Sax

---
 etc/psa_config/DC2C_print03_red.json    | 2 +-
 etc/psa_config/DC2C_print03_yellow.json | 2 +-
 etc/psa_config/DC2C_print07_red.json    | 2 +-
 etc/psa_config/DC2C_print07_yellow.json | 2 +-
 etc/psa_config/DC2C_print24.json        | 4 ++--
 etc/psa_config/DC2C_print25.json        | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/psa_config/DC2C_print03_red.json b/etc/psa_config/DC2C_print03_red.json
index cca1bd4..18b7c29 100755
--- a/etc/psa_config/DC2C_print03_red.json
+++ b/etc/psa_config/DC2C_print03_red.json
@@ -9,7 +9,7 @@
 "feed":"margin02",
 "feed":"rim02",
 "styl":"size 00",
-"text":"Sumokėta:", 
+"text":"Sumokėta grynais:", 
 "vari":"Dynamic02",
 "styl":"size 21",
 "text":"Raudonoji zona",
diff --git a/etc/psa_config/DC2C_print03_yellow.json b/etc/psa_config/DC2C_print03_yellow.json
index 46573a2..c28fe36 100755
--- a/etc/psa_config/DC2C_print03_yellow.json
+++ b/etc/psa_config/DC2C_print03_yellow.json
@@ -8,7 +8,7 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Sumokėta:", 
+"text":"Sumokėta grynais:", 
 "vari":"Dynamic02",
 "styl":"size 21",
 "text":"Geltonoji zona",
diff --git a/etc/psa_config/DC2C_print07_red.json b/etc/psa_config/DC2C_print07_red.json
index e4915aa..1be3ecf 100755
--- a/etc/psa_config/DC2C_print07_red.json
+++ b/etc/psa_config/DC2C_print07_red.json
@@ -8,7 +8,7 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Sumokėta:", 
+"text":"Sumokėta kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
 "text":"Raudonoji zona",
diff --git a/etc/psa_config/DC2C_print07_yellow.json b/etc/psa_config/DC2C_print07_yellow.json
index 2ec5a71..fafb9fa 100755
--- a/etc/psa_config/DC2C_print07_yellow.json
+++ b/etc/psa_config/DC2C_print07_yellow.json
@@ -8,7 +8,7 @@
 "feed":"margin02",
 "feed":"rim02",
 "styl":"size 00",
-"text":"Sumokėta:", 
+"text":"Sumokėta kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
 "text":"Geltonoji zona",
diff --git a/etc/psa_config/DC2C_print24.json b/etc/psa_config/DC2C_print24.json
index f4a8088..90d2b8b 100755
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
@@ -13,9 +13,9 @@
 "feed":"nl",
 "text":"Vietinė rinkliava",
 "feed":"nl",
-"text":"pagal pranesima Nr.",
+"text":"pagal pranešimą Nr.",
 "feed":"nl",
-"styl":"size 21",
+"styl":"size 11",
 "vari":"Dynamic08",
 "styl":"size 00"
 }
diff --git a/etc/psa_config/DC2C_print25.json b/etc/psa_config/DC2C_print25.json
index 278c0f9..57f2378 100755
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -11,17 +11,17 @@
 "feed":"nl",
 "text":"Automobilio valstybinis numeris:",
 "feed":"nl",
-"styl":"font 10",
-"styl":"size 21",
+"styl":"size 22",
 "vari":"Dynamic01",
 "styl":"size 00",
 "feed":"nl",
 "text":"Sumokėta:", 
 "feed":"nl",
+"styl":"size 11",
 "vari":"Dynamic02",
 "styl":"size 00",
 "feed":"nl",
-"text":"Mokejimo data ir laikas:", 
+"text":"Mokėjimo data ir laikas:", 
 "feed":"nl",
 "styl":"size 11",
 "vari":"date us",	

From 11e0374581fdf4286ebd6fb684cfe8414a569d10 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 12 Sep 2024 15:37:52 +0200
Subject: [PATCH 10/16] Change tariff files according to new settings sent from
 Eugenijus

---
 etc/psa_tariff/tariff02.json |   28 +-
 etc/psa_tariff/tariff03.json | 2418 ++++++++++++++++++++++++++++++++++
 etc/psa_tariff/tariff04.json | 1158 ++++++++++++++++
 3 files changed, 3590 insertions(+), 14 deletions(-)
 create mode 100644 etc/psa_tariff/tariff03.json
 create mode 100644 etc/psa_tariff/tariff04.json

diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 14180c6..7c47fe8 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -171,8 +171,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -180,8 +180,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -189,8 +189,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -198,8 +198,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -207,8 +207,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -216,8 +216,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -225,8 +225,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           }
       ]
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
new file mode 100644
index 0000000..b61ea58
--- /dev/null
+++ b/etc/psa_tariff/tariff03.json
@@ -0,0 +1,2418 @@
+{
+  "Project" : "Kleipeda",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Info"    : "Red Zone",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "22:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "22:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "00:00:00",
+      "time_range_to": "08:00:00"
+    }
+  ],
+  "Prepaid": [
+    {
+        "prepaid_id": 1,
+        "prepaid_anytime": true,
+        "prepaid_never": false
+    },
+    {
+        "prepaid_id": 2,
+        "prepaid_anytime": false,
+        "prepaid_never": true
+    },
+    {
+        "prepaid_id": 3,
+        "prepaid_anytime": false,
+        "prepaid_never": false,
+        "prepaid_static_start": "22:00:00",
+        "prepaid_static_end": "08:00:00"
+    }
+  ],
+  "CarryOver": [
+    {
+      "carry_over_id" : 1,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    },
+    {
+      "carry_over_id" : 2,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 12,
+      "comment_pop_min_time": "12mins -> 30 cent",
+      "pop_max_time": 840,
+      "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_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
+      "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,
+      "pop_business_hours": 163584,
+      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
+    }
+  ],
+  "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 1,
+        "pra_price": 10
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 2,
+        "pra_price": 20
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 3,
+        "pra_price": 30
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 4,
+        "pra_price": 40
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 5,
+        "pra_price": 50
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 6,
+        "pra_price": 60
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 7,
+        "pra_price": 70
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 8,
+        "pra_price": 80
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 9,
+        "pra_price": 90
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 10,
+        "pra_price": 100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 11,
+        "pra_price": 110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 12,
+        "pra_price": 120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 13,
+        "pra_price": 130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 14,
+        "pra_price": 140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 15,
+        "pra_price": 150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 16,
+        "pra_price": 160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 17,
+        "pra_price": 170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 18,
+        "pra_price": 180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 19,
+        "pra_price": 190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 20,
+        "pra_price": 200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 21,
+        "pra_price": 210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 22,
+        "pra_price": 220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 23,
+        "pra_price": 230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 24,
+        "pra_price": 240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 25,
+        "pra_price": 250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 26,
+        "pra_price": 260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 27,
+        "pra_price": 270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 28,
+        "pra_price": 280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 29,
+        "pra_price": 290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 30,
+        "pra_price": 300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 31,
+        "pra_price": 310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 32,
+        "pra_price": 320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 33,
+        "pra_price": 330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 34,
+        "pra_price": 340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 35,
+        "pra_price": 350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 36,
+        "pra_price": 360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 37,
+        "pra_price": 370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 38,
+        "pra_price": 380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 39,
+        "pra_price": 390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 40,
+        "pra_price": 400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 41,
+        "pra_price": 410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 42,
+        "pra_price": 420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 43,
+        "pra_price": 430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 44,
+        "pra_price": 440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 45,
+        "pra_price": 450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 46,
+        "pra_price": 460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 47,
+        "pra_price": 470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 48,
+        "pra_price": 480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 49,
+        "pra_price": 490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 50,
+        "pra_price": 500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 51,
+        "pra_price": 510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 52,
+        "pra_price": 520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 53,
+        "pra_price": 530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 54,
+        "pra_price": 540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 55,
+        "pra_price": 550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 56,
+        "pra_price": 560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 57,
+        "pra_price": 570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 58,
+        "pra_price": 580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 59,
+        "pra_price": 590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 60,
+        "pra_price": 600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 61,
+        "pra_price": 610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 62,
+        "pra_price": 620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 63,
+        "pra_price": 630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 64,
+        "pra_price": 640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 65,
+        "pra_price": 650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 66,
+        "pra_price": 660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 67,
+        "pra_price": 670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 68,
+        "pra_price": 680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 69,
+        "pra_price": 690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 70,
+        "pra_price": 700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 71,
+        "pra_price": 710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 72,
+        "pra_price": 720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 73,
+        "pra_price": 730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 74,
+        "pra_price": 740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 75,
+        "pra_price": 750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 76,
+        "pra_price": 760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 77,
+        "pra_price": 770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 78,
+        "pra_price": 780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 79,
+        "pra_price": 790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 80,
+        "pra_price": 800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 81,
+        "pra_price": 810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 82,
+        "pra_price": 820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 83,
+        "pra_price": 830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 84,
+        "pra_price": 840
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 850
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 860
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 870
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 880
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 890
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
+        "pra_price": 900
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 91,
+        "pra_price": 910
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 92,
+        "pra_price": 920
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 93,
+        "pra_price": 930
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 94,
+        "pra_price": 940
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 95,
+        "pra_price": 950
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 96,
+        "pra_price": 960
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 97,
+        "pra_price": 970
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 98,
+        "pra_price": 980
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 99,
+        "pra_price": 990
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 100,
+        "pra_price": 1000
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 101,
+        "pra_price": 1010
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 102,
+        "pra_price": 1020
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 103,
+        "pra_price": 1030
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 104,
+        "pra_price": 1040
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 105,
+        "pra_price": 1050
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 106,
+        "pra_price": 1060
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 107,
+        "pra_price": 1070
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 108,
+        "pra_price": 1080
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 109,
+        "pra_price": 1090
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 110,
+        "pra_price": 1100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 111,
+        "pra_price": 1110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 112,
+        "pra_price": 1120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 113,
+        "pra_price": 1130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 114,
+        "pra_price": 1140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 115,
+        "pra_price": 1150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 116,
+        "pra_price": 1160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 117,
+        "pra_price": 1170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 118,
+        "pra_price": 1180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 119,
+        "pra_price": 1190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 120,
+        "pra_price": 1200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 121,
+        "pra_price": 1210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 122,
+        "pra_price": 1220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 123,
+        "pra_price": 1230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 124,
+        "pra_price": 1240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 125,
+        "pra_price": 1250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 126,
+        "pra_price": 1260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 127,
+        "pra_price": 1270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 128,
+        "pra_price": 1280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 129,
+        "pra_price": 1290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 130,
+        "pra_price": 1300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 131,
+        "pra_price": 1310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 132,
+        "pra_price": 1320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 133,
+        "pra_price": 1330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 134,
+        "pra_price": 1340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 135,
+        "pra_price": 1350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 136,
+        "pra_price": 1360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 137,
+        "pra_price": 1370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 138,
+        "pra_price": 1380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 139,
+        "pra_price": 1390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 140,
+        "pra_price": 1400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 141,
+        "pra_price": 1410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 142,
+        "pra_price": 1420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 143,
+        "pra_price": 1430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 144,
+        "pra_price": 1440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 145,
+        "pra_price": 1450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 146,
+        "pra_price": 1460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 147,
+        "pra_price": 1470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 148,
+        "pra_price": 1480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 149,
+        "pra_price": 1490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 150,
+        "pra_price": 1500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 151,
+        "pra_price": 1510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 152,
+        "pra_price": 1520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 153,
+        "pra_price": 1530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 154,
+        "pra_price": 1540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 155,
+        "pra_price": 1550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 156,
+        "pra_price": 1560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 157,
+        "pra_price": 1570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 158,
+        "pra_price": 1580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 159,
+        "pra_price": 1590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 160,
+        "pra_price": 1600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 161,
+        "pra_price": 1610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 162,
+        "pra_price": 1620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 163,
+        "pra_price": 1630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 164,
+        "pra_price": 1640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 165,
+        "pra_price": 1650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 166,
+        "pra_price": 1660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 167,
+        "pra_price": 1670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 168,
+        "pra_price": 1680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 169,
+        "pra_price": 1690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 170,
+        "pra_price": 1700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 171,
+        "pra_price": 1710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 172,
+        "pra_price": 1720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 173,
+        "pra_price": 1730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 174,
+        "pra_price": 1740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 175,
+        "pra_price": 1750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 176,
+        "pra_price": 1760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 177,
+        "pra_price": 1770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 178,
+        "pra_price": 1780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 179,
+        "pra_price": 1790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 180,
+        "pra_price": 1800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 181,
+        "pra_price": 1810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 182,
+        "pra_price": 1820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 183,
+        "pra_price": 1830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 184,
+        "pra_price": 1840
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 185,
+        "pra_price": 1850
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 186,
+        "pra_price": 1860
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 187,
+        "pra_price": 1870
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 188,
+        "pra_price": 1880
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 189,
+        "pra_price": 1890
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 190,
+        "pra_price": 1900
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 191,
+        "pra_price": 1910
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 192,
+        "pra_price": 1920
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 193,
+        "pra_price": 1930
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 194,
+        "pra_price": 1940
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 195,
+        "pra_price": 1950
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 196,
+        "pra_price": 1960
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 197,
+        "pra_price": 1970
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 198,
+        "pra_price": 1980
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 199,
+        "pra_price": 1990
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 200,
+        "pra_price": 2000
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 201,
+        "pra_price": 2010
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 202,
+        "pra_price": 2020
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 203,
+        "pra_price": 2030
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 204,
+        "pra_price": 2040
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 205,
+        "pra_price": 2050
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 206,
+        "pra_price": 2060
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 207,
+        "pra_price": 2070
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 208,
+        "pra_price": 2080
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 209,
+        "pra_price": 2090
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 210,
+        "pra_price": 2100
+    }
+  ],
+  "Duration": [
+    {
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
+    },
+    {
+	"pun_duration": 4,
+	"pun_id": 1,
+	"pun_label": "4 min"
+    },
+    {
+	"pun_duration": 8,
+	"pun_id": 2,
+	"pun_label": "8 min"
+    },
+    {
+	"pun_duration": 12,
+	"pun_id": 3,
+	"pun_label": "12 min"
+    },
+    {
+	"pun_duration": 16,
+	"pun_id": 4,
+	"pun_label": "16 min"
+    },
+    {
+	"pun_duration": 20,
+	"pun_id": 5,
+	"pun_label": "20 min"
+    },
+    {
+	"pun_duration": 24,
+	"pun_id": 6,
+	"pun_label": "24 min"
+    },
+    {
+	"pun_duration": 28,
+	"pun_id": 7,
+	"pun_label": "28 min"
+    },
+    {
+	"pun_duration": 32,
+	"pun_id": 8,
+	"pun_label": "32 min"
+    },
+    {
+	"pun_duration": 36,
+	"pun_id": 9,
+	"pun_label": "36 min"
+    },
+    {
+	"pun_duration": 40,
+	"pun_id": 10,
+	"pun_label": "40 min"
+    },
+    {
+	"pun_duration": 44,
+	"pun_id": 11,
+	"pun_label": "44 min"
+    },
+    {
+	"pun_duration": 48,
+	"pun_id": 12,
+	"pun_label": "48 min"
+    },
+    {
+	"pun_duration": 52,
+	"pun_id": 13,
+	"pun_label": "52 min"
+    },
+    {
+	"pun_duration": 56,
+	"pun_id": 14,
+	"pun_label": "56 min"
+    },
+    {
+	"pun_duration": 60,
+	"pun_id": 15,
+	"pun_label": "60 min"
+    },
+    {
+	"pun_duration": 64,
+	"pun_id": 16,
+	"pun_label": "64 min"
+    },
+    {
+	"pun_duration": 68,
+	"pun_id": 17,
+	"pun_label": "68 min"
+    },
+    {
+	"pun_duration": 72,
+	"pun_id": 18,
+	"pun_label": "72 min"
+    },
+    {
+	"pun_duration": 76,
+	"pun_id": 19,
+	"pun_label": "76 min"
+    },
+    {
+	"pun_duration": 80,
+	"pun_id": 20,
+	"pun_label": "80 min"
+    },
+    {
+	"pun_duration": 84,
+	"pun_id": 21,
+	"pun_label": "84 min"
+    },
+    {
+	"pun_duration": 88,
+	"pun_id": 22,
+	"pun_label": "88 min"
+    },
+    {
+	"pun_duration": 92,
+	"pun_id": 23,
+	"pun_label": "92 min"
+    },
+    {
+	"pun_duration": 96,
+	"pun_id": 24,
+	"pun_label": "96 min"
+    },
+    {
+	"pun_duration": 100,
+	"pun_id": 25,
+	"pun_label": "100 min"
+    },
+    {
+	"pun_duration": 104,
+	"pun_id": 26,
+	"pun_label": "104 min"
+    },
+    {
+	"pun_duration": 108,
+	"pun_id": 27,
+	"pun_label": "108 min"
+    },
+    {
+	"pun_duration": 112,
+	"pun_id": 28,
+	"pun_label": "112 min"
+    },
+    {
+	"pun_duration": 116,
+	"pun_id": 29,
+	"pun_label": "116 min"
+    },
+    {
+	"pun_duration": 120,
+	"pun_id": 30,
+	"pun_label": "120 min"
+    },
+    {
+	"pun_duration": 124,
+	"pun_id": 31,
+	"pun_label": "124 min"
+    },
+    {
+	"pun_duration": 128,
+	"pun_id": 32,
+	"pun_label": "128 min"
+    },
+    {
+	"pun_duration": 132,
+	"pun_id": 33,
+	"pun_label": "132 min"
+    },
+    {
+	"pun_duration": 136,
+	"pun_id": 34,
+	"pun_label": "136 min"
+    },
+    {
+	"pun_duration": 140,
+	"pun_id": 35,
+	"pun_label": "140 min"
+    },
+    {
+	"pun_duration": 144,
+	"pun_id": 36,
+	"pun_label": "144 min"
+    },
+    {
+	"pun_duration": 148,
+	"pun_id": 37,
+	"pun_label": "148 min"
+    },
+    {
+	"pun_duration": 152,
+	"pun_id": 38,
+	"pun_label": "152 min"
+    },
+    {
+	"pun_duration": 156,
+	"pun_id": 39,
+	"pun_label": "156 min"
+    },
+    {
+	"pun_duration": 160,
+	"pun_id": 40,
+	"pun_label": "160 min"
+    },
+    {
+	"pun_duration": 164,
+	"pun_id": 41,
+	"pun_label": "164 min"
+    },
+    {
+	"pun_duration": 168,
+	"pun_id": 42,
+	"pun_label": "168 min"
+    },
+    {
+	"pun_duration": 172,
+	"pun_id": 43,
+	"pun_label": "172 min"
+    },
+    {
+	"pun_duration": 176,
+	"pun_id": 44,
+	"pun_label": "176 min"
+    },
+    {
+	"pun_duration": 180,
+	"pun_id": 45,
+	"pun_label": "180 min"
+    },
+    {
+	"pun_duration": 184,
+	"pun_id": 46,
+	"pun_label": "184 min"
+    },
+    {
+	"pun_duration": 188,
+	"pun_id": 47,
+	"pun_label": "188 min"
+    },
+    {
+	"pun_duration": 192,
+	"pun_id": 48,
+	"pun_label": "192 min"
+    },
+    {
+	"pun_duration": 196,
+	"pun_id": 49,
+	"pun_label": "196 min"
+    },
+    {
+	"pun_duration": 200,
+	"pun_id": 50,
+	"pun_label": "200 min"
+    },
+    {
+	"pun_duration": 204,
+	"pun_id": 51,
+	"pun_label": "204 min"
+    },
+    {
+	"pun_duration": 208,
+	"pun_id": 52,
+	"pun_label": "208 min"
+    },
+    {
+	"pun_duration": 212,
+	"pun_id": 53,
+	"pun_label": "212 min"
+    },
+    {
+	"pun_duration": 216,
+	"pun_id": 54,
+	"pun_label": "216 min"
+    },
+    {
+	"pun_duration": 220,
+	"pun_id": 55,
+	"pun_label": "220 min"
+    },
+    {
+	"pun_duration": 224,
+	"pun_id": 56,
+	"pun_label": "224 min"
+    },
+    {
+	"pun_duration": 228,
+	"pun_id": 57,
+	"pun_label": "228 min"
+    },
+    {
+	"pun_duration": 232,
+	"pun_id": 58,
+	"pun_label": "232 min"
+    },
+    {
+	"pun_duration": 236,
+	"pun_id": 59,
+	"pun_label": "236 min"
+    },
+    {
+	"pun_duration": 240,
+	"pun_id": 60,
+	"pun_label": "240 min"
+    },
+    {
+	"pun_duration": 244,
+	"pun_id": 61,
+	"pun_label": "244 min"
+    },
+    {
+	"pun_duration": 248,
+	"pun_id": 62,
+	"pun_label": "248 min"
+    },
+    {
+	"pun_duration": 252,
+	"pun_id": 63,
+	"pun_label": "252 min"
+    },
+    {
+	"pun_duration": 256,
+	"pun_id": 64,
+	"pun_label": "256 min"
+    },
+    {
+	"pun_duration": 260,
+	"pun_id": 65,
+	"pun_label": "260 min"
+    },
+    {
+	"pun_duration": 264,
+	"pun_id": 66,
+	"pun_label": "264 min"
+    },
+    {
+	"pun_duration": 268,
+	"pun_id": 67,
+	"pun_label": "268 min"
+    },
+    {
+	"pun_duration": 272,
+	"pun_id": 68,
+	"pun_label": "272 min"
+    },
+    {
+	"pun_duration": 276,
+	"pun_id": 69,
+	"pun_label": "276 min"
+    },
+    {
+	"pun_duration": 280,
+	"pun_id": 70,
+	"pun_label": "280 min"
+    },
+    {
+	"pun_duration": 284,
+	"pun_id": 71,
+	"pun_label": "284 min"
+    },
+    {
+	"pun_duration": 288,
+	"pun_id": 72,
+	"pun_label": "288 min"
+    },
+    {
+	"pun_duration": 292,
+	"pun_id": 73,
+	"pun_label": "292 min"
+    },
+    {
+	"pun_duration": 296,
+	"pun_id": 74,
+	"pun_label": "296 min"
+    },
+    {
+	"pun_duration": 300,
+	"pun_id": 75,
+	"pun_label": "300 min"
+    },
+    {
+	"pun_duration": 304,
+	"pun_id": 76,
+	"pun_label": "304 min"
+    },
+    {
+	"pun_duration": 308,
+	"pun_id": 77,
+	"pun_label": "308 min"
+    },
+    {
+	"pun_duration": 312,
+	"pun_id": 78,
+	"pun_label": "312 min"
+    },
+    {
+	"pun_duration": 316,
+	"pun_id": 79,
+	"pun_label": "316 min"
+    },
+    {
+	"pun_duration": 320,
+	"pun_id": 80,
+	"pun_label": "320 min"
+    },
+    {
+	"pun_duration": 324,
+	"pun_id": 81,
+	"pun_label": "324 min"
+    },
+    {
+	"pun_duration": 328,
+	"pun_id": 82,
+	"pun_label": "328 min"
+    },
+    {
+	"pun_duration": 332,
+	"pun_id": 83,
+	"pun_label": "332 min"
+    },
+    {
+	"pun_duration": 336,
+	"pun_id": 84,
+	"pun_label": "336 min"
+    },
+    {
+	"pun_duration": 340,
+	"pun_id": 85,
+	"pun_label": "340 min"
+    },
+    {
+	"pun_duration": 344,
+	"pun_id": 86,
+	"pun_label": "344 min"
+    },
+    {
+	"pun_duration": 348,
+	"pun_id": 87,
+	"pun_label": "348 min"
+    },
+    {
+	"pun_duration": 352,
+	"pun_id": 88,
+	"pun_label": "352 min"
+    },
+    {
+	"pun_duration": 356,
+	"pun_id": 89,
+	"pun_label": "356 min"
+    },
+    {
+	"pun_duration": 360,
+	"pun_id": 90,
+	"pun_label": "360 min"
+    },
+    {
+	"pun_duration": 364,
+	"pun_id": 91,
+	"pun_label": "364 min"
+    },
+    {
+	"pun_duration": 368,
+	"pun_id": 92,
+	"pun_label": "368 min"
+    },
+    {
+	"pun_duration": 372,
+	"pun_id": 93,
+	"pun_label": "372 min"
+    },
+    {
+	"pun_duration": 376,
+	"pun_id": 94,
+	"pun_label": "376 min"
+    },
+    {
+	"pun_duration": 380,
+	"pun_id": 95,
+	"pun_label": "380 min"
+    },
+    {
+	"pun_duration": 384,
+	"pun_id": 96,
+	"pun_label": "384 min"
+    },
+    {
+	"pun_duration": 388,
+	"pun_id": 97,
+	"pun_label": "388 min"
+    },
+    {
+	"pun_duration": 392,
+	"pun_id": 98,
+	"pun_label": "392 min"
+    },
+    {
+	"pun_duration": 396,
+	"pun_id": 99,
+	"pun_label": "396 min"
+    },
+    {
+	"pun_duration": 400,
+	"pun_id": 100,
+	"pun_label": "400 min"
+    },
+    {
+	"pun_duration": 404,
+	"pun_id": 101,
+	"pun_label": "404 min"
+    },
+    {
+	"pun_duration": 408,
+	"pun_id": 102,
+	"pun_label": "408 min"
+    },
+    {
+	"pun_duration": 412,
+	"pun_id": 103,
+	"pun_label": "412 min"
+    },
+    {
+	"pun_duration": 416,
+	"pun_id": 104,
+	"pun_label": "416 min"
+    },
+    {
+	"pun_duration": 420,
+	"pun_id": 105,
+	"pun_label": "420 min"
+    },
+    {
+	"pun_duration": 424,
+	"pun_id": 106,
+	"pun_label": "424 min"
+    },
+    {
+	"pun_duration": 428,
+	"pun_id": 107,
+	"pun_label": "428 min"
+    },
+    {
+	"pun_duration": 432,
+	"pun_id": 108,
+	"pun_label": "432 min"
+    },
+    {
+	"pun_duration": 436,
+	"pun_id": 109,
+	"pun_label": "436 min"
+    },
+    {
+	"pun_duration": 440,
+	"pun_id": 110,
+	"pun_label": "440 min"
+    },
+    {
+	"pun_duration": 444,
+	"pun_id": 111,
+	"pun_label": "444 min"
+    },
+    {
+	"pun_duration": 448,
+	"pun_id": 112,
+	"pun_label": "448 min"
+    },
+    {
+	"pun_duration": 452,
+	"pun_id": 113,
+	"pun_label": "452 min"
+    },
+    {
+	"pun_duration": 456,
+	"pun_id": 114,
+	"pun_label": "456 min"
+    },
+    {
+	"pun_duration": 460,
+	"pun_id": 115,
+	"pun_label": "460 min"
+    },
+    {
+	"pun_duration": 464,
+	"pun_id": 116,
+	"pun_label": "464 min"
+    },
+    {
+	"pun_duration": 468,
+	"pun_id": 117,
+	"pun_label": "468 min"
+    },
+    {
+	"pun_duration": 472,
+	"pun_id": 118,
+	"pun_label": "472 min"
+    },
+    {
+	"pun_duration": 476,
+	"pun_id": 119,
+	"pun_label": "476 min"
+    },
+    {
+	"pun_duration": 480,
+	"pun_id": 120,
+	"pun_label": "480 min"
+    },
+    {
+	"pun_duration": 484,
+	"pun_id": 121,
+	"pun_label": "484 min"
+    },
+    {
+	"pun_duration": 488,
+	"pun_id": 122,
+	"pun_label": "488 min"
+    },
+    {
+	"pun_duration": 492,
+	"pun_id": 123,
+	"pun_label": "492 min"
+    },
+    {
+	"pun_duration": 496,
+	"pun_id": 124,
+	"pun_label": "496 min"
+    },
+    {
+	"pun_duration": 500,
+	"pun_id": 125,
+	"pun_label": "500 min"
+    },
+    {
+	"pun_duration": 504,
+	"pun_id": 126,
+	"pun_label": "504 min"
+    },
+    {
+	"pun_duration": 508,
+	"pun_id": 127,
+	"pun_label": "508 min"
+    },
+    {
+	"pun_duration": 512,
+	"pun_id": 128,
+	"pun_label": "512 min"
+    },
+    {
+	"pun_duration": 516,
+	"pun_id": 129,
+	"pun_label": "516 min"
+    },
+    {
+	"pun_duration": 520,
+	"pun_id": 130,
+	"pun_label": "520 min"
+    },
+    {
+	"pun_duration": 524,
+	"pun_id": 131,
+	"pun_label": "524 min"
+    },
+    {
+	"pun_duration": 528,
+	"pun_id": 132,
+	"pun_label": "528 min"
+    },
+    {
+	"pun_duration": 532,
+	"pun_id": 133,
+	"pun_label": "532 min"
+    },
+    {
+	"pun_duration": 536,
+	"pun_id": 134,
+	"pun_label": "536 min"
+    },
+    {
+	"pun_duration": 540,
+	"pun_id": 135,
+	"pun_label": "540 min"
+    },
+    {
+	"pun_duration": 544,
+	"pun_id": 136,
+	"pun_label": "544 min"
+    },
+    {
+	"pun_duration": 548,
+	"pun_id": 137,
+	"pun_label": "548 min"
+    },
+    {
+	"pun_duration": 552,
+	"pun_id": 138,
+	"pun_label": "552 min"
+    },
+    {
+	"pun_duration": 556,
+	"pun_id": 139,
+	"pun_label": "556 min"
+    },
+    {
+	"pun_duration": 560,
+	"pun_id": 140,
+	"pun_label": "560 min"
+    },
+    {
+	"pun_duration": 564,
+	"pun_id": 141,
+	"pun_label": "564 min"
+    },
+    {
+	"pun_duration": 568,
+	"pun_id": 142,
+	"pun_label": "568 min"
+    },
+    {
+	"pun_duration": 572,
+	"pun_id": 143,
+	"pun_label": "572 min"
+    },
+    {
+	"pun_duration": 576,
+	"pun_id": 144,
+	"pun_label": "576 min"
+    },
+    {
+	"pun_duration": 580,
+	"pun_id": 145,
+	"pun_label": "580 min"
+    },
+    {
+	"pun_duration": 584,
+	"pun_id": 146,
+	"pun_label": "584 min"
+    },
+    {
+	"pun_duration": 588,
+	"pun_id": 147,
+	"pun_label": "588 min"
+    },
+    {
+	"pun_duration": 592,
+	"pun_id": 148,
+	"pun_label": "592 min"
+    },
+    {
+	"pun_duration": 596,
+	"pun_id": 149,
+	"pun_label": "596 min"
+    },
+    {
+	"pun_duration": 600,
+	"pun_id": 150,
+	"pun_label": "600 min"
+    },
+    {
+	"pun_duration": 604,
+	"pun_id": 151,
+	"pun_label": "604 min"
+    },
+    {
+	"pun_duration": 608,
+	"pun_id": 152,
+	"pun_label": "608 min"
+    },
+    {
+	"pun_duration": 612,
+	"pun_id": 153,
+	"pun_label": "612 min"
+    },
+    {
+	"pun_duration": 616,
+	"pun_id": 154,
+	"pun_label": "616 min"
+    },
+    {
+	"pun_duration": 620,
+	"pun_id": 155,
+	"pun_label": "620 min"
+    },
+    {
+	"pun_duration": 624,
+	"pun_id": 156,
+	"pun_label": "624 min"
+    },
+    {
+	"pun_duration": 628,
+	"pun_id": 157,
+	"pun_label": "628 min"
+    },
+    {
+	"pun_duration": 632,
+	"pun_id": 158,
+	"pun_label": "632 min"
+    },
+    {
+	"pun_duration": 636,
+	"pun_id": 159,
+	"pun_label": "636 min"
+    },
+    {
+	"pun_duration": 640,
+	"pun_id": 160,
+	"pun_label": "640 min"
+    },
+    {
+	"pun_duration": 644,
+	"pun_id": 161,
+	"pun_label": "644 min"
+    },
+    {
+	"pun_duration": 648,
+	"pun_id": 162,
+	"pun_label": "648 min"
+    },
+    {
+	"pun_duration": 652,
+	"pun_id": 163,
+	"pun_label": "652 min"
+    },
+    {
+	"pun_duration": 656,
+	"pun_id": 164,
+	"pun_label": "656 min"
+    },
+    {
+	"pun_duration": 660,
+	"pun_id": 165,
+	"pun_label": "660 min"
+    },
+    {
+	"pun_duration": 664,
+	"pun_id": 166,
+	"pun_label": "664 min"
+    },
+    {
+	"pun_duration": 668,
+	"pun_id": 167,
+	"pun_label": "668 min"
+    },
+    {
+	"pun_duration": 672,
+	"pun_id": 168,
+	"pun_label": "672 min"
+    },
+    {
+	"pun_duration": 676,
+	"pun_id": 169,
+	"pun_label": "676 min"
+    },
+    {
+	"pun_duration": 680,
+	"pun_id": 170,
+	"pun_label": "680 min"
+    },
+    {
+	"pun_duration": 684,
+	"pun_id": 171,
+	"pun_label": "684 min"
+    },
+    {
+	"pun_duration": 688,
+	"pun_id": 172,
+	"pun_label": "688 min"
+    },
+    {
+	"pun_duration": 692,
+	"pun_id": 173,
+	"pun_label": "692 min"
+    },
+    {
+	"pun_duration": 696,
+	"pun_id": 174,
+	"pun_label": "696 min"
+    },
+    {
+	"pun_duration": 700,
+	"pun_id": 175,
+	"pun_label": "700 min"
+    },
+    {
+	"pun_duration": 704,
+	"pun_id": 176,
+	"pun_label": "704 min"
+    },
+    {
+	"pun_duration": 708,
+	"pun_id": 177,
+	"pun_label": "708 min"
+    },
+    {
+	"pun_duration": 712,
+	"pun_id": 178,
+	"pun_label": "712 min"
+    },
+    {
+	"pun_duration": 716,
+	"pun_id": 179,
+	"pun_label": "716 min"
+    },
+    {
+	"pun_duration": 720,
+	"pun_id": 180,
+	"pun_label": "720 min"
+    },
+    {
+	"pun_duration": 724,
+	"pun_id": 181,
+	"pun_label": "724 min"
+    },
+    {
+	"pun_duration": 728,
+	"pun_id": 182,
+	"pun_label": "728 min"
+    },
+    {
+	"pun_duration": 732,
+	"pun_id": 183,
+	"pun_label": "732 min"
+    },
+    {
+	"pun_duration": 736,
+	"pun_id": 184,
+	"pun_label": "736 min"
+    },
+    {
+	"pun_duration": 740,
+	"pun_id": 185,
+	"pun_label": "740 min"
+    },
+    {
+	"pun_duration": 744,
+	"pun_id": 186,
+	"pun_label": "744 min"
+    },
+    {
+	"pun_duration": 748,
+	"pun_id": 187,
+	"pun_label": "748 min"
+    },
+    {
+	"pun_duration": 752,
+	"pun_id": 188,
+	"pun_label": "752 min"
+    },
+    {
+	"pun_duration": 756,
+	"pun_id": 189,
+	"pun_label": "756 min"
+    },
+    {
+	"pun_duration": 760,
+	"pun_id": 190,
+	"pun_label": "760 min"
+    },
+    {
+	"pun_duration": 764,
+	"pun_id": 191,
+	"pun_label": "764 min"
+    },
+    {
+	"pun_duration": 768,
+	"pun_id": 192,
+	"pun_label": "768 min"
+    },
+    {
+	"pun_duration": 772,
+	"pun_id": 193,
+	"pun_label": "772 min"
+    },
+    {
+	"pun_duration": 776,
+	"pun_id": 194,
+	"pun_label": "776 min"
+    },
+    {
+	"pun_duration": 780,
+	"pun_id": 195,
+	"pun_label": "780 min"
+    },
+    {
+	"pun_duration": 784,
+	"pun_id": 196,
+	"pun_label": "784 min"
+    },
+    {
+	"pun_duration": 788,
+	"pun_id": 197,
+	"pun_label": "788 min"
+    },
+    {
+	"pun_duration": 792,
+	"pun_id": 198,
+	"pun_label": "792 min"
+    },
+    {
+	"pun_duration": 796,
+	"pun_id": 199,
+	"pun_label": "796 min"
+    },
+    {
+	"pun_duration": 800,
+	"pun_id": 200,
+	"pun_label": "800 min"
+    },
+    {
+	"pun_duration": 804,
+	"pun_id": 201,
+	"pun_label": "804 min"
+    },
+    {
+	"pun_duration": 808,
+	"pun_id": 202,
+	"pun_label": "808 min"
+    },
+    {
+	"pun_duration": 812,
+	"pun_id": 203,
+	"pun_label": "812 min"
+    },
+    {
+	"pun_duration": 816,
+	"pun_id": 204,
+	"pun_label": "816 min"
+    },
+    {
+	"pun_duration": 820,
+	"pun_id": 205,
+	"pun_label": "820 min"
+    },
+    {
+	"pun_duration": 824,
+	"pun_id": 206,
+	"pun_label": "824 min"
+    },
+    {
+	"pun_duration": 828,
+	"pun_id": 207,
+	"pun_label": "828 min"
+    },
+    {
+	"pun_duration": 832,
+	"pun_id": 208,
+	"pun_label": "832 min"
+    },
+    {
+	"pun_duration": 836,
+	"pun_id": 209,
+	"pun_label": "836 min"
+    },
+    {
+	"pun_duration": 840,
+	"pun_id": 210,
+	"pun_label": "840 min"
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 627,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 1,
+      "pye_label": "May - September",
+      "pye_start_month": 5,
+      "pye_start_day": 1,
+      "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
+    }
+  ]
+}
diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json
new file mode 100644
index 0000000..1b9101e
--- /dev/null
+++ b/etc/psa_tariff/tariff04.json
@@ -0,0 +1,1158 @@
+{
+  "Project" : "Kleipeda",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Info"    : "Yellow Zone",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "22:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "22:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "00:00:00",
+      "time_range_to": "08:00:00"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 30,
+      "comment_pop_min_time": "30mins -> 30 cent",
+      "pop_max_time": 840,
+      "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_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
+      "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,
+      "pop_business_hours": 163584,
+      "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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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,
+        "pra_price": 10
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 2,
+        "pra_price": 20
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 3,
+        "pra_price": 30
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 4,
+        "pra_price": 40
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 5,
+        "pra_price": 50
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 6,
+        "pra_price": 60
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 7,
+        "pra_price": 70
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 8,
+        "pra_price": 80
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 9,
+        "pra_price": 90
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 10,
+        "pra_price": 100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 11,
+        "pra_price": 110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 12,
+        "pra_price": 120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 13,
+        "pra_price": 130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 14,
+        "pra_price": 140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 15,
+        "pra_price": 150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 16,
+        "pra_price": 160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 17,
+        "pra_price": 170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 18,
+        "pra_price": 180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 19,
+        "pra_price": 190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 20,
+        "pra_price": 200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 21,
+        "pra_price": 210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 22,
+        "pra_price": 220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 23,
+        "pra_price": 230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 24,
+        "pra_price": 240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 25,
+        "pra_price": 250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 26,
+        "pra_price": 260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 27,
+        "pra_price": 270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 28,
+        "pra_price": 280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 29,
+        "pra_price": 290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 30,
+        "pra_price": 300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 31,
+        "pra_price": 310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 32,
+        "pra_price": 320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 33,
+        "pra_price": 330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 34,
+        "pra_price": 340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 35,
+        "pra_price": 350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 36,
+        "pra_price": 360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 37,
+        "pra_price": 370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 38,
+        "pra_price": 380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 39,
+        "pra_price": 390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 40,
+        "pra_price": 400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 41,
+        "pra_price": 410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 42,
+        "pra_price": 420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 43,
+        "pra_price": 430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 44,
+        "pra_price": 440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 45,
+        "pra_price": 450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 46,
+        "pra_price": 460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 47,
+        "pra_price": 470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 48,
+        "pra_price": 480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 49,
+        "pra_price": 490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 50,
+        "pra_price": 500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 51,
+        "pra_price": 510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 52,
+        "pra_price": 520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 53,
+        "pra_price": 530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 54,
+        "pra_price": 540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 55,
+        "pra_price": 550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 56,
+        "pra_price": 560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 57,
+        "pra_price": 570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 58,
+        "pra_price": 580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 59,
+        "pra_price": 590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 60,
+        "pra_price": 600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 61,
+        "pra_price": 610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 62,
+        "pra_price": 620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 63,
+        "pra_price": 630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 64,
+        "pra_price": 640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 65,
+        "pra_price": 650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 66,
+        "pra_price": 660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 67,
+        "pra_price": 670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 68,
+        "pra_price": 680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 69,
+        "pra_price": 690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 70,
+        "pra_price": 700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 71,
+        "pra_price": 710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 72,
+        "pra_price": 720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 73,
+        "pra_price": 730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 74,
+        "pra_price": 740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 75,
+        "pra_price": 750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 76,
+        "pra_price": 760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 77,
+        "pra_price": 770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 78,
+        "pra_price": 780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 79,
+        "pra_price": 790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 80,
+        "pra_price": 800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 81,
+        "pra_price": 810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 82,
+        "pra_price": 820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 83,
+        "pra_price": 830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 84,
+        "pra_price": 840
+    }
+  ],
+  "Duration": [
+    {
+	     "pun_duration": 0,
+	     "pun_id": 0,
+	     "pun_label": "0 min"
+    },
+    {
+        "pun_duration": 10,
+        "pun_id": 1,
+        "pun_label": "10 min"
+    },
+    {
+        "pun_duration": 20,
+        "pun_id": 2,
+        "pun_label": "20 min"
+    },
+    {
+        "pun_duration": 30,
+        "pun_id": 3,
+        "pun_label": "30 min"
+    },
+    {
+        "pun_duration": 40,
+        "pun_id": 4,
+        "pun_label": "40 min"
+    },
+    {
+        "pun_duration": 50,
+        "pun_id": 5,
+        "pun_label": "50 min"
+    },
+    {
+        "pun_duration": 60,
+        "pun_id": 6,
+        "pun_label": "60 min"
+    },
+    {
+        "pun_duration": 70,
+        "pun_id": 7,
+        "pun_label": "70 min"
+    },
+    {
+        "pun_duration": 80,
+        "pun_id": 8,
+        "pun_label": "80 min"
+    },
+    {
+        "pun_duration": 90,
+        "pun_id": 9,
+        "pun_label": "90 min"
+    },
+    {
+        "pun_duration": 100,
+        "pun_id": 10,
+        "pun_label": "100 min"
+    },
+    {
+        "pun_duration": 110,
+        "pun_id": 11,
+        "pun_label": "110 min"
+    },
+    {
+        "pun_duration": 120,
+        "pun_id": 12,
+        "pun_label": "120 min"
+    },
+    {
+        "pun_duration": 130,
+        "pun_id": 13,
+        "pun_label": "130 min"
+    },
+    {
+        "pun_duration": 140,
+        "pun_id": 14,
+        "pun_label": "140 min"
+    },
+    {
+        "pun_duration": 150,
+        "pun_id": 15,
+        "pun_label": "150 min"
+    },
+    {
+        "pun_duration": 160,
+        "pun_id": 16,
+        "pun_label": "160 min"
+    },
+    {
+        "pun_duration": 170,
+        "pun_id": 17,
+        "pun_label": "170 min"
+    },
+    {
+        "pun_duration": 180,
+        "pun_id": 18,
+        "pun_label": "180 min"
+    },
+    {
+        "pun_duration": 190,
+        "pun_id": 19,
+        "pun_label": "190 min"
+    },
+    {
+        "pun_duration": 200,
+        "pun_id": 20,
+        "pun_label": "200 min"
+    },
+    {
+        "pun_duration": 210,
+        "pun_id": 21,
+        "pun_label": "210 min"
+    },
+    {
+        "pun_duration": 220,
+        "pun_id": 22,
+        "pun_label": "220 min"
+    },
+    {
+        "pun_duration": 230,
+        "pun_id": 23,
+        "pun_label": "230 min"
+    },
+    {
+        "pun_duration": 240,
+        "pun_id": 24,
+        "pun_label": "240 min"
+    },
+    {
+        "pun_duration": 250,
+        "pun_id": 25,
+        "pun_label": "250 min"
+    },
+    {
+        "pun_duration": 260,
+        "pun_id": 26,
+        "pun_label": "260 min"
+    },
+    {
+        "pun_duration": 270,
+        "pun_id": 27,
+        "pun_label": "270 min"
+    },
+    {
+        "pun_duration": 280,
+        "pun_id": 28,
+        "pun_label": "280 min"
+    },
+    {
+        "pun_duration": 290,
+        "pun_id": 29,
+        "pun_label": "290 min"
+    },
+    {
+        "pun_duration": 300,
+        "pun_id": 30,
+        "pun_label": "300 min"
+    },
+    {
+        "pun_duration": 310,
+        "pun_id": 31,
+        "pun_label": "310 min"
+    },
+    {
+        "pun_duration": 320,
+        "pun_id": 32,
+        "pun_label": "320 min"
+    },
+    {
+        "pun_duration": 330,
+        "pun_id": 33,
+        "pun_label": "330 min"
+    },
+    {
+        "pun_duration": 340,
+        "pun_id": 34,
+        "pun_label": "340 min"
+    },
+    {
+        "pun_duration": 350,
+        "pun_id": 35,
+        "pun_label": "350 min"
+    },
+    {
+        "pun_duration": 360,
+        "pun_id": 36,
+        "pun_label": "360 min"
+    },
+    {
+        "pun_duration": 370,
+        "pun_id": 37,
+        "pun_label": "370 min"
+    },
+    {
+        "pun_duration": 380,
+        "pun_id": 38,
+        "pun_label": "380 min"
+    },
+    {
+        "pun_duration": 390,
+        "pun_id": 39,
+        "pun_label": "390 min"
+    },
+    {
+        "pun_duration": 400,
+        "pun_id": 40,
+        "pun_label": "400 min"
+    },
+    {
+        "pun_duration": 410,
+        "pun_id": 41,
+        "pun_label": "410 min"
+    },
+    {
+        "pun_duration": 420,
+        "pun_id": 42,
+        "pun_label": "420 min"
+    },
+    {
+        "pun_duration": 430,
+        "pun_id": 43,
+        "pun_label": "430 min"
+    },
+    {
+        "pun_duration": 440,
+        "pun_id": 44,
+        "pun_label": "440 min"
+    },
+    {
+        "pun_duration": 450,
+        "pun_id": 45,
+        "pun_label": "450 min"
+    },
+    {
+        "pun_duration": 460,
+        "pun_id": 46,
+        "pun_label": "460 min"
+    },
+    {
+        "pun_duration": 470,
+        "pun_id": 47,
+        "pun_label": "470 min"
+    },
+    {
+        "pun_duration": 480,
+        "pun_id": 48,
+        "pun_label": "480 min"
+    },
+    {
+        "pun_duration": 490,
+        "pun_id": 49,
+        "pun_label": "490 min"
+    },
+    {
+        "pun_duration": 500,
+        "pun_id": 50,
+        "pun_label": "500 min"
+    },
+    {
+        "pun_duration": 510,
+        "pun_id": 51,
+        "pun_label": "510 min"
+    },
+    {
+        "pun_duration": 520,
+        "pun_id": 52,
+        "pun_label": "520 min"
+    },
+    {
+        "pun_duration": 530,
+        "pun_id": 53,
+        "pun_label": "530 min"
+    },
+    {
+        "pun_duration": 540,
+        "pun_id": 54,
+        "pun_label": "540 min"
+    },
+    {
+        "pun_duration": 550,
+        "pun_id": 55,
+        "pun_label": "550 min"
+    },
+    {
+        "pun_duration": 560,
+        "pun_id": 56,
+        "pun_label": "560 min"
+    },
+    {
+        "pun_duration": 570,
+        "pun_id": 57,
+        "pun_label": "570 min"
+    },
+    {
+        "pun_duration": 580,
+        "pun_id": 58,
+        "pun_label": "580 min"
+    },
+    {
+        "pun_duration": 590,
+        "pun_id": 59,
+        "pun_label": "590 min"
+    },
+    {
+        "pun_duration": 600,
+        "pun_id": 60,
+        "pun_label": "600 min"
+    },
+    {
+        "pun_duration": 610,
+        "pun_id": 61,
+        "pun_label": "610 min"
+    },
+    {
+        "pun_duration": 620,
+        "pun_id": 62,
+        "pun_label": "620 min"
+    },
+    {
+        "pun_duration": 630,
+        "pun_id": 63,
+        "pun_label": "630 min"
+    },
+    {
+        "pun_duration": 640,
+        "pun_id": 64,
+        "pun_label": "640 min"
+    },
+    {
+        "pun_duration": 650,
+        "pun_id": 65,
+        "pun_label": "650 min"
+    },
+    {
+        "pun_duration": 660,
+        "pun_id": 66,
+        "pun_label": "660 min"
+    },
+    {
+        "pun_duration": 670,
+        "pun_id": 67,
+        "pun_label": "670 min"
+    },
+    {
+        "pun_duration": 680,
+        "pun_id": 68,
+        "pun_label": "680 min"
+    },
+    {
+        "pun_duration": 690,
+        "pun_id": 69,
+        "pun_label": "690 min"
+    },
+    {
+        "pun_duration": 700,
+        "pun_id": 70,
+        "pun_label": "700 min"
+    },
+    {
+        "pun_duration": 710,
+        "pun_id": 71,
+        "pun_label": "710 min"
+    },
+    {
+        "pun_duration": 720,
+        "pun_id": 72,
+        "pun_label": "720 min"
+    },
+    {
+        "pun_duration": 730,
+        "pun_id": 73,
+        "pun_label": "730 min"
+    },
+    {
+        "pun_duration": 740,
+        "pun_id": 74,
+        "pun_label": "740 min"
+    },
+    {
+        "pun_duration": 750,
+        "pun_id": 75,
+        "pun_label": "750 min"
+    },
+    {
+        "pun_duration": 760,
+        "pun_id": 76,
+        "pun_label": "760 min"
+    },
+    {
+        "pun_duration": 770,
+        "pun_id": 77,
+        "pun_label": "770 min"
+    },
+    {
+        "pun_duration": 780,
+        "pun_id": 78,
+        "pun_label": "780 min"
+    },
+    {
+        "pun_duration": 790,
+        "pun_id": 79,
+        "pun_label": "790 min"
+    },
+    {
+        "pun_duration": 800,
+        "pun_id": 80,
+        "pun_label": "800 min"
+    },
+    {
+        "pun_duration": 810,
+        "pun_id": 81,
+        "pun_label": "810 min"
+    },
+    {
+        "pun_duration": 820,
+        "pun_id": 82,
+        "pun_label": "820 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 83,
+        "pun_label": "830 min"
+    },
+    {
+        "pun_duration": 840,
+        "pun_id": 84,
+        "pun_label": "840 min"
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 1,
+      "pye_label": "May - September",
+      "pye_start_month": 5,
+      "pye_start_day": 1,
+      "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
+    }
+  ]
+}

From 6f051a6cbc167d07eaefe0f3a41c17b05a5f8945 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Fri, 13 Sep 2024 10:10:27 +0200
Subject: [PATCH 11/16] First step for new tariffs: Change times
 (carry-over-limts).

---
 etc/psa_tariff/tariff01.json |    2 +-
 etc/psa_tariff/tariff02.json |   98 +-
 etc/psa_tariff/tariff03.json | 2418 ++++++++++++++++++++++++++++++++++
 etc/psa_tariff/tariff04.json | 1218 +++++++++++++++++
 4 files changed, 3716 insertions(+), 20 deletions(-)
 create mode 100644 etc/psa_tariff/tariff03.json
 create mode 100644 etc/psa_tariff/tariff04.json

diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index b61ea58..2ebbc9d 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
   "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "Red Zone",
+  "Info"    : "Red Zone (center)",
   "Currency": [
     {
       "pcu_id": 2,
diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 14180c6..6ea270d 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -49,7 +49,7 @@
   "PaymentOption": [
     {
       "pop_id": 1049,
-      "pop_label": "Zone 1",
+      "pop_label": "Zone 2",
       "pop_payment_method_id": 4,
       "pop_day_end_time": "00:00:00",
       "pop_day_night_end_time": "00:00:00",
@@ -171,8 +171,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -180,8 +180,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -189,8 +189,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -198,8 +198,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -207,8 +207,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -216,8 +216,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -225,8 +225,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           }
       ]
@@ -656,14 +656,44 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 84,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
         "pra_price": 840
     }
   ],
   "Duration": [
     {
-	     "pun_duration": 0,
-	     "pun_id": 0,
-	     "pun_label": "0 min"
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
     },
     {
         "pun_duration": 10,
@@ -1081,9 +1111,39 @@
         "pun_label": "830 min"
     },
     {
-        "pun_duration": 840,
+        "pun_duration": 830,
         "pun_id": 84,
         "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 85,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 86,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 87,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 88,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 89,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 840,
+        "pun_id": 90,
+        "pun_label": "840 min"
     }
   ],
   "WeekDaysWorktime": [
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
new file mode 100644
index 0000000..b61ea58
--- /dev/null
+++ b/etc/psa_tariff/tariff03.json
@@ -0,0 +1,2418 @@
+{
+  "Project" : "Kleipeda",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Info"    : "Red Zone",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "22:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "22:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "00:00:00",
+      "time_range_to": "08:00:00"
+    }
+  ],
+  "Prepaid": [
+    {
+        "prepaid_id": 1,
+        "prepaid_anytime": true,
+        "prepaid_never": false
+    },
+    {
+        "prepaid_id": 2,
+        "prepaid_anytime": false,
+        "prepaid_never": true
+    },
+    {
+        "prepaid_id": 3,
+        "prepaid_anytime": false,
+        "prepaid_never": false,
+        "prepaid_static_start": "22:00:00",
+        "prepaid_static_end": "08:00:00"
+    }
+  ],
+  "CarryOver": [
+    {
+      "carry_over_id" : 1,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    },
+    {
+      "carry_over_id" : 2,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 12,
+      "comment_pop_min_time": "12mins -> 30 cent",
+      "pop_max_time": 840,
+      "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_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
+      "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,
+      "pop_business_hours": 163584,
+      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
+    }
+  ],
+  "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 1,
+        "pra_price": 10
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 2,
+        "pra_price": 20
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 3,
+        "pra_price": 30
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 4,
+        "pra_price": 40
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 5,
+        "pra_price": 50
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 6,
+        "pra_price": 60
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 7,
+        "pra_price": 70
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 8,
+        "pra_price": 80
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 9,
+        "pra_price": 90
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 10,
+        "pra_price": 100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 11,
+        "pra_price": 110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 12,
+        "pra_price": 120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 13,
+        "pra_price": 130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 14,
+        "pra_price": 140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 15,
+        "pra_price": 150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 16,
+        "pra_price": 160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 17,
+        "pra_price": 170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 18,
+        "pra_price": 180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 19,
+        "pra_price": 190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 20,
+        "pra_price": 200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 21,
+        "pra_price": 210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 22,
+        "pra_price": 220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 23,
+        "pra_price": 230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 24,
+        "pra_price": 240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 25,
+        "pra_price": 250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 26,
+        "pra_price": 260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 27,
+        "pra_price": 270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 28,
+        "pra_price": 280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 29,
+        "pra_price": 290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 30,
+        "pra_price": 300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 31,
+        "pra_price": 310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 32,
+        "pra_price": 320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 33,
+        "pra_price": 330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 34,
+        "pra_price": 340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 35,
+        "pra_price": 350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 36,
+        "pra_price": 360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 37,
+        "pra_price": 370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 38,
+        "pra_price": 380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 39,
+        "pra_price": 390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 40,
+        "pra_price": 400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 41,
+        "pra_price": 410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 42,
+        "pra_price": 420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 43,
+        "pra_price": 430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 44,
+        "pra_price": 440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 45,
+        "pra_price": 450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 46,
+        "pra_price": 460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 47,
+        "pra_price": 470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 48,
+        "pra_price": 480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 49,
+        "pra_price": 490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 50,
+        "pra_price": 500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 51,
+        "pra_price": 510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 52,
+        "pra_price": 520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 53,
+        "pra_price": 530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 54,
+        "pra_price": 540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 55,
+        "pra_price": 550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 56,
+        "pra_price": 560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 57,
+        "pra_price": 570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 58,
+        "pra_price": 580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 59,
+        "pra_price": 590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 60,
+        "pra_price": 600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 61,
+        "pra_price": 610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 62,
+        "pra_price": 620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 63,
+        "pra_price": 630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 64,
+        "pra_price": 640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 65,
+        "pra_price": 650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 66,
+        "pra_price": 660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 67,
+        "pra_price": 670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 68,
+        "pra_price": 680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 69,
+        "pra_price": 690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 70,
+        "pra_price": 700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 71,
+        "pra_price": 710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 72,
+        "pra_price": 720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 73,
+        "pra_price": 730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 74,
+        "pra_price": 740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 75,
+        "pra_price": 750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 76,
+        "pra_price": 760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 77,
+        "pra_price": 770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 78,
+        "pra_price": 780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 79,
+        "pra_price": 790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 80,
+        "pra_price": 800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 81,
+        "pra_price": 810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 82,
+        "pra_price": 820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 83,
+        "pra_price": 830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 84,
+        "pra_price": 840
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 850
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 860
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 870
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 880
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 890
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
+        "pra_price": 900
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 91,
+        "pra_price": 910
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 92,
+        "pra_price": 920
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 93,
+        "pra_price": 930
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 94,
+        "pra_price": 940
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 95,
+        "pra_price": 950
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 96,
+        "pra_price": 960
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 97,
+        "pra_price": 970
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 98,
+        "pra_price": 980
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 99,
+        "pra_price": 990
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 100,
+        "pra_price": 1000
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 101,
+        "pra_price": 1010
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 102,
+        "pra_price": 1020
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 103,
+        "pra_price": 1030
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 104,
+        "pra_price": 1040
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 105,
+        "pra_price": 1050
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 106,
+        "pra_price": 1060
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 107,
+        "pra_price": 1070
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 108,
+        "pra_price": 1080
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 109,
+        "pra_price": 1090
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 110,
+        "pra_price": 1100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 111,
+        "pra_price": 1110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 112,
+        "pra_price": 1120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 113,
+        "pra_price": 1130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 114,
+        "pra_price": 1140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 115,
+        "pra_price": 1150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 116,
+        "pra_price": 1160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 117,
+        "pra_price": 1170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 118,
+        "pra_price": 1180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 119,
+        "pra_price": 1190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 120,
+        "pra_price": 1200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 121,
+        "pra_price": 1210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 122,
+        "pra_price": 1220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 123,
+        "pra_price": 1230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 124,
+        "pra_price": 1240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 125,
+        "pra_price": 1250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 126,
+        "pra_price": 1260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 127,
+        "pra_price": 1270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 128,
+        "pra_price": 1280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 129,
+        "pra_price": 1290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 130,
+        "pra_price": 1300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 131,
+        "pra_price": 1310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 132,
+        "pra_price": 1320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 133,
+        "pra_price": 1330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 134,
+        "pra_price": 1340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 135,
+        "pra_price": 1350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 136,
+        "pra_price": 1360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 137,
+        "pra_price": 1370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 138,
+        "pra_price": 1380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 139,
+        "pra_price": 1390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 140,
+        "pra_price": 1400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 141,
+        "pra_price": 1410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 142,
+        "pra_price": 1420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 143,
+        "pra_price": 1430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 144,
+        "pra_price": 1440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 145,
+        "pra_price": 1450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 146,
+        "pra_price": 1460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 147,
+        "pra_price": 1470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 148,
+        "pra_price": 1480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 149,
+        "pra_price": 1490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 150,
+        "pra_price": 1500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 151,
+        "pra_price": 1510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 152,
+        "pra_price": 1520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 153,
+        "pra_price": 1530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 154,
+        "pra_price": 1540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 155,
+        "pra_price": 1550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 156,
+        "pra_price": 1560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 157,
+        "pra_price": 1570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 158,
+        "pra_price": 1580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 159,
+        "pra_price": 1590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 160,
+        "pra_price": 1600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 161,
+        "pra_price": 1610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 162,
+        "pra_price": 1620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 163,
+        "pra_price": 1630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 164,
+        "pra_price": 1640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 165,
+        "pra_price": 1650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 166,
+        "pra_price": 1660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 167,
+        "pra_price": 1670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 168,
+        "pra_price": 1680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 169,
+        "pra_price": 1690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 170,
+        "pra_price": 1700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 171,
+        "pra_price": 1710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 172,
+        "pra_price": 1720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 173,
+        "pra_price": 1730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 174,
+        "pra_price": 1740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 175,
+        "pra_price": 1750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 176,
+        "pra_price": 1760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 177,
+        "pra_price": 1770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 178,
+        "pra_price": 1780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 179,
+        "pra_price": 1790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 180,
+        "pra_price": 1800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 181,
+        "pra_price": 1810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 182,
+        "pra_price": 1820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 183,
+        "pra_price": 1830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 184,
+        "pra_price": 1840
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 185,
+        "pra_price": 1850
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 186,
+        "pra_price": 1860
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 187,
+        "pra_price": 1870
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 188,
+        "pra_price": 1880
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 189,
+        "pra_price": 1890
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 190,
+        "pra_price": 1900
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 191,
+        "pra_price": 1910
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 192,
+        "pra_price": 1920
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 193,
+        "pra_price": 1930
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 194,
+        "pra_price": 1940
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 195,
+        "pra_price": 1950
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 196,
+        "pra_price": 1960
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 197,
+        "pra_price": 1970
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 198,
+        "pra_price": 1980
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 199,
+        "pra_price": 1990
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 200,
+        "pra_price": 2000
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 201,
+        "pra_price": 2010
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 202,
+        "pra_price": 2020
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 203,
+        "pra_price": 2030
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 204,
+        "pra_price": 2040
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 205,
+        "pra_price": 2050
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 206,
+        "pra_price": 2060
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 207,
+        "pra_price": 2070
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 208,
+        "pra_price": 2080
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 209,
+        "pra_price": 2090
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 210,
+        "pra_price": 2100
+    }
+  ],
+  "Duration": [
+    {
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
+    },
+    {
+	"pun_duration": 4,
+	"pun_id": 1,
+	"pun_label": "4 min"
+    },
+    {
+	"pun_duration": 8,
+	"pun_id": 2,
+	"pun_label": "8 min"
+    },
+    {
+	"pun_duration": 12,
+	"pun_id": 3,
+	"pun_label": "12 min"
+    },
+    {
+	"pun_duration": 16,
+	"pun_id": 4,
+	"pun_label": "16 min"
+    },
+    {
+	"pun_duration": 20,
+	"pun_id": 5,
+	"pun_label": "20 min"
+    },
+    {
+	"pun_duration": 24,
+	"pun_id": 6,
+	"pun_label": "24 min"
+    },
+    {
+	"pun_duration": 28,
+	"pun_id": 7,
+	"pun_label": "28 min"
+    },
+    {
+	"pun_duration": 32,
+	"pun_id": 8,
+	"pun_label": "32 min"
+    },
+    {
+	"pun_duration": 36,
+	"pun_id": 9,
+	"pun_label": "36 min"
+    },
+    {
+	"pun_duration": 40,
+	"pun_id": 10,
+	"pun_label": "40 min"
+    },
+    {
+	"pun_duration": 44,
+	"pun_id": 11,
+	"pun_label": "44 min"
+    },
+    {
+	"pun_duration": 48,
+	"pun_id": 12,
+	"pun_label": "48 min"
+    },
+    {
+	"pun_duration": 52,
+	"pun_id": 13,
+	"pun_label": "52 min"
+    },
+    {
+	"pun_duration": 56,
+	"pun_id": 14,
+	"pun_label": "56 min"
+    },
+    {
+	"pun_duration": 60,
+	"pun_id": 15,
+	"pun_label": "60 min"
+    },
+    {
+	"pun_duration": 64,
+	"pun_id": 16,
+	"pun_label": "64 min"
+    },
+    {
+	"pun_duration": 68,
+	"pun_id": 17,
+	"pun_label": "68 min"
+    },
+    {
+	"pun_duration": 72,
+	"pun_id": 18,
+	"pun_label": "72 min"
+    },
+    {
+	"pun_duration": 76,
+	"pun_id": 19,
+	"pun_label": "76 min"
+    },
+    {
+	"pun_duration": 80,
+	"pun_id": 20,
+	"pun_label": "80 min"
+    },
+    {
+	"pun_duration": 84,
+	"pun_id": 21,
+	"pun_label": "84 min"
+    },
+    {
+	"pun_duration": 88,
+	"pun_id": 22,
+	"pun_label": "88 min"
+    },
+    {
+	"pun_duration": 92,
+	"pun_id": 23,
+	"pun_label": "92 min"
+    },
+    {
+	"pun_duration": 96,
+	"pun_id": 24,
+	"pun_label": "96 min"
+    },
+    {
+	"pun_duration": 100,
+	"pun_id": 25,
+	"pun_label": "100 min"
+    },
+    {
+	"pun_duration": 104,
+	"pun_id": 26,
+	"pun_label": "104 min"
+    },
+    {
+	"pun_duration": 108,
+	"pun_id": 27,
+	"pun_label": "108 min"
+    },
+    {
+	"pun_duration": 112,
+	"pun_id": 28,
+	"pun_label": "112 min"
+    },
+    {
+	"pun_duration": 116,
+	"pun_id": 29,
+	"pun_label": "116 min"
+    },
+    {
+	"pun_duration": 120,
+	"pun_id": 30,
+	"pun_label": "120 min"
+    },
+    {
+	"pun_duration": 124,
+	"pun_id": 31,
+	"pun_label": "124 min"
+    },
+    {
+	"pun_duration": 128,
+	"pun_id": 32,
+	"pun_label": "128 min"
+    },
+    {
+	"pun_duration": 132,
+	"pun_id": 33,
+	"pun_label": "132 min"
+    },
+    {
+	"pun_duration": 136,
+	"pun_id": 34,
+	"pun_label": "136 min"
+    },
+    {
+	"pun_duration": 140,
+	"pun_id": 35,
+	"pun_label": "140 min"
+    },
+    {
+	"pun_duration": 144,
+	"pun_id": 36,
+	"pun_label": "144 min"
+    },
+    {
+	"pun_duration": 148,
+	"pun_id": 37,
+	"pun_label": "148 min"
+    },
+    {
+	"pun_duration": 152,
+	"pun_id": 38,
+	"pun_label": "152 min"
+    },
+    {
+	"pun_duration": 156,
+	"pun_id": 39,
+	"pun_label": "156 min"
+    },
+    {
+	"pun_duration": 160,
+	"pun_id": 40,
+	"pun_label": "160 min"
+    },
+    {
+	"pun_duration": 164,
+	"pun_id": 41,
+	"pun_label": "164 min"
+    },
+    {
+	"pun_duration": 168,
+	"pun_id": 42,
+	"pun_label": "168 min"
+    },
+    {
+	"pun_duration": 172,
+	"pun_id": 43,
+	"pun_label": "172 min"
+    },
+    {
+	"pun_duration": 176,
+	"pun_id": 44,
+	"pun_label": "176 min"
+    },
+    {
+	"pun_duration": 180,
+	"pun_id": 45,
+	"pun_label": "180 min"
+    },
+    {
+	"pun_duration": 184,
+	"pun_id": 46,
+	"pun_label": "184 min"
+    },
+    {
+	"pun_duration": 188,
+	"pun_id": 47,
+	"pun_label": "188 min"
+    },
+    {
+	"pun_duration": 192,
+	"pun_id": 48,
+	"pun_label": "192 min"
+    },
+    {
+	"pun_duration": 196,
+	"pun_id": 49,
+	"pun_label": "196 min"
+    },
+    {
+	"pun_duration": 200,
+	"pun_id": 50,
+	"pun_label": "200 min"
+    },
+    {
+	"pun_duration": 204,
+	"pun_id": 51,
+	"pun_label": "204 min"
+    },
+    {
+	"pun_duration": 208,
+	"pun_id": 52,
+	"pun_label": "208 min"
+    },
+    {
+	"pun_duration": 212,
+	"pun_id": 53,
+	"pun_label": "212 min"
+    },
+    {
+	"pun_duration": 216,
+	"pun_id": 54,
+	"pun_label": "216 min"
+    },
+    {
+	"pun_duration": 220,
+	"pun_id": 55,
+	"pun_label": "220 min"
+    },
+    {
+	"pun_duration": 224,
+	"pun_id": 56,
+	"pun_label": "224 min"
+    },
+    {
+	"pun_duration": 228,
+	"pun_id": 57,
+	"pun_label": "228 min"
+    },
+    {
+	"pun_duration": 232,
+	"pun_id": 58,
+	"pun_label": "232 min"
+    },
+    {
+	"pun_duration": 236,
+	"pun_id": 59,
+	"pun_label": "236 min"
+    },
+    {
+	"pun_duration": 240,
+	"pun_id": 60,
+	"pun_label": "240 min"
+    },
+    {
+	"pun_duration": 244,
+	"pun_id": 61,
+	"pun_label": "244 min"
+    },
+    {
+	"pun_duration": 248,
+	"pun_id": 62,
+	"pun_label": "248 min"
+    },
+    {
+	"pun_duration": 252,
+	"pun_id": 63,
+	"pun_label": "252 min"
+    },
+    {
+	"pun_duration": 256,
+	"pun_id": 64,
+	"pun_label": "256 min"
+    },
+    {
+	"pun_duration": 260,
+	"pun_id": 65,
+	"pun_label": "260 min"
+    },
+    {
+	"pun_duration": 264,
+	"pun_id": 66,
+	"pun_label": "264 min"
+    },
+    {
+	"pun_duration": 268,
+	"pun_id": 67,
+	"pun_label": "268 min"
+    },
+    {
+	"pun_duration": 272,
+	"pun_id": 68,
+	"pun_label": "272 min"
+    },
+    {
+	"pun_duration": 276,
+	"pun_id": 69,
+	"pun_label": "276 min"
+    },
+    {
+	"pun_duration": 280,
+	"pun_id": 70,
+	"pun_label": "280 min"
+    },
+    {
+	"pun_duration": 284,
+	"pun_id": 71,
+	"pun_label": "284 min"
+    },
+    {
+	"pun_duration": 288,
+	"pun_id": 72,
+	"pun_label": "288 min"
+    },
+    {
+	"pun_duration": 292,
+	"pun_id": 73,
+	"pun_label": "292 min"
+    },
+    {
+	"pun_duration": 296,
+	"pun_id": 74,
+	"pun_label": "296 min"
+    },
+    {
+	"pun_duration": 300,
+	"pun_id": 75,
+	"pun_label": "300 min"
+    },
+    {
+	"pun_duration": 304,
+	"pun_id": 76,
+	"pun_label": "304 min"
+    },
+    {
+	"pun_duration": 308,
+	"pun_id": 77,
+	"pun_label": "308 min"
+    },
+    {
+	"pun_duration": 312,
+	"pun_id": 78,
+	"pun_label": "312 min"
+    },
+    {
+	"pun_duration": 316,
+	"pun_id": 79,
+	"pun_label": "316 min"
+    },
+    {
+	"pun_duration": 320,
+	"pun_id": 80,
+	"pun_label": "320 min"
+    },
+    {
+	"pun_duration": 324,
+	"pun_id": 81,
+	"pun_label": "324 min"
+    },
+    {
+	"pun_duration": 328,
+	"pun_id": 82,
+	"pun_label": "328 min"
+    },
+    {
+	"pun_duration": 332,
+	"pun_id": 83,
+	"pun_label": "332 min"
+    },
+    {
+	"pun_duration": 336,
+	"pun_id": 84,
+	"pun_label": "336 min"
+    },
+    {
+	"pun_duration": 340,
+	"pun_id": 85,
+	"pun_label": "340 min"
+    },
+    {
+	"pun_duration": 344,
+	"pun_id": 86,
+	"pun_label": "344 min"
+    },
+    {
+	"pun_duration": 348,
+	"pun_id": 87,
+	"pun_label": "348 min"
+    },
+    {
+	"pun_duration": 352,
+	"pun_id": 88,
+	"pun_label": "352 min"
+    },
+    {
+	"pun_duration": 356,
+	"pun_id": 89,
+	"pun_label": "356 min"
+    },
+    {
+	"pun_duration": 360,
+	"pun_id": 90,
+	"pun_label": "360 min"
+    },
+    {
+	"pun_duration": 364,
+	"pun_id": 91,
+	"pun_label": "364 min"
+    },
+    {
+	"pun_duration": 368,
+	"pun_id": 92,
+	"pun_label": "368 min"
+    },
+    {
+	"pun_duration": 372,
+	"pun_id": 93,
+	"pun_label": "372 min"
+    },
+    {
+	"pun_duration": 376,
+	"pun_id": 94,
+	"pun_label": "376 min"
+    },
+    {
+	"pun_duration": 380,
+	"pun_id": 95,
+	"pun_label": "380 min"
+    },
+    {
+	"pun_duration": 384,
+	"pun_id": 96,
+	"pun_label": "384 min"
+    },
+    {
+	"pun_duration": 388,
+	"pun_id": 97,
+	"pun_label": "388 min"
+    },
+    {
+	"pun_duration": 392,
+	"pun_id": 98,
+	"pun_label": "392 min"
+    },
+    {
+	"pun_duration": 396,
+	"pun_id": 99,
+	"pun_label": "396 min"
+    },
+    {
+	"pun_duration": 400,
+	"pun_id": 100,
+	"pun_label": "400 min"
+    },
+    {
+	"pun_duration": 404,
+	"pun_id": 101,
+	"pun_label": "404 min"
+    },
+    {
+	"pun_duration": 408,
+	"pun_id": 102,
+	"pun_label": "408 min"
+    },
+    {
+	"pun_duration": 412,
+	"pun_id": 103,
+	"pun_label": "412 min"
+    },
+    {
+	"pun_duration": 416,
+	"pun_id": 104,
+	"pun_label": "416 min"
+    },
+    {
+	"pun_duration": 420,
+	"pun_id": 105,
+	"pun_label": "420 min"
+    },
+    {
+	"pun_duration": 424,
+	"pun_id": 106,
+	"pun_label": "424 min"
+    },
+    {
+	"pun_duration": 428,
+	"pun_id": 107,
+	"pun_label": "428 min"
+    },
+    {
+	"pun_duration": 432,
+	"pun_id": 108,
+	"pun_label": "432 min"
+    },
+    {
+	"pun_duration": 436,
+	"pun_id": 109,
+	"pun_label": "436 min"
+    },
+    {
+	"pun_duration": 440,
+	"pun_id": 110,
+	"pun_label": "440 min"
+    },
+    {
+	"pun_duration": 444,
+	"pun_id": 111,
+	"pun_label": "444 min"
+    },
+    {
+	"pun_duration": 448,
+	"pun_id": 112,
+	"pun_label": "448 min"
+    },
+    {
+	"pun_duration": 452,
+	"pun_id": 113,
+	"pun_label": "452 min"
+    },
+    {
+	"pun_duration": 456,
+	"pun_id": 114,
+	"pun_label": "456 min"
+    },
+    {
+	"pun_duration": 460,
+	"pun_id": 115,
+	"pun_label": "460 min"
+    },
+    {
+	"pun_duration": 464,
+	"pun_id": 116,
+	"pun_label": "464 min"
+    },
+    {
+	"pun_duration": 468,
+	"pun_id": 117,
+	"pun_label": "468 min"
+    },
+    {
+	"pun_duration": 472,
+	"pun_id": 118,
+	"pun_label": "472 min"
+    },
+    {
+	"pun_duration": 476,
+	"pun_id": 119,
+	"pun_label": "476 min"
+    },
+    {
+	"pun_duration": 480,
+	"pun_id": 120,
+	"pun_label": "480 min"
+    },
+    {
+	"pun_duration": 484,
+	"pun_id": 121,
+	"pun_label": "484 min"
+    },
+    {
+	"pun_duration": 488,
+	"pun_id": 122,
+	"pun_label": "488 min"
+    },
+    {
+	"pun_duration": 492,
+	"pun_id": 123,
+	"pun_label": "492 min"
+    },
+    {
+	"pun_duration": 496,
+	"pun_id": 124,
+	"pun_label": "496 min"
+    },
+    {
+	"pun_duration": 500,
+	"pun_id": 125,
+	"pun_label": "500 min"
+    },
+    {
+	"pun_duration": 504,
+	"pun_id": 126,
+	"pun_label": "504 min"
+    },
+    {
+	"pun_duration": 508,
+	"pun_id": 127,
+	"pun_label": "508 min"
+    },
+    {
+	"pun_duration": 512,
+	"pun_id": 128,
+	"pun_label": "512 min"
+    },
+    {
+	"pun_duration": 516,
+	"pun_id": 129,
+	"pun_label": "516 min"
+    },
+    {
+	"pun_duration": 520,
+	"pun_id": 130,
+	"pun_label": "520 min"
+    },
+    {
+	"pun_duration": 524,
+	"pun_id": 131,
+	"pun_label": "524 min"
+    },
+    {
+	"pun_duration": 528,
+	"pun_id": 132,
+	"pun_label": "528 min"
+    },
+    {
+	"pun_duration": 532,
+	"pun_id": 133,
+	"pun_label": "532 min"
+    },
+    {
+	"pun_duration": 536,
+	"pun_id": 134,
+	"pun_label": "536 min"
+    },
+    {
+	"pun_duration": 540,
+	"pun_id": 135,
+	"pun_label": "540 min"
+    },
+    {
+	"pun_duration": 544,
+	"pun_id": 136,
+	"pun_label": "544 min"
+    },
+    {
+	"pun_duration": 548,
+	"pun_id": 137,
+	"pun_label": "548 min"
+    },
+    {
+	"pun_duration": 552,
+	"pun_id": 138,
+	"pun_label": "552 min"
+    },
+    {
+	"pun_duration": 556,
+	"pun_id": 139,
+	"pun_label": "556 min"
+    },
+    {
+	"pun_duration": 560,
+	"pun_id": 140,
+	"pun_label": "560 min"
+    },
+    {
+	"pun_duration": 564,
+	"pun_id": 141,
+	"pun_label": "564 min"
+    },
+    {
+	"pun_duration": 568,
+	"pun_id": 142,
+	"pun_label": "568 min"
+    },
+    {
+	"pun_duration": 572,
+	"pun_id": 143,
+	"pun_label": "572 min"
+    },
+    {
+	"pun_duration": 576,
+	"pun_id": 144,
+	"pun_label": "576 min"
+    },
+    {
+	"pun_duration": 580,
+	"pun_id": 145,
+	"pun_label": "580 min"
+    },
+    {
+	"pun_duration": 584,
+	"pun_id": 146,
+	"pun_label": "584 min"
+    },
+    {
+	"pun_duration": 588,
+	"pun_id": 147,
+	"pun_label": "588 min"
+    },
+    {
+	"pun_duration": 592,
+	"pun_id": 148,
+	"pun_label": "592 min"
+    },
+    {
+	"pun_duration": 596,
+	"pun_id": 149,
+	"pun_label": "596 min"
+    },
+    {
+	"pun_duration": 600,
+	"pun_id": 150,
+	"pun_label": "600 min"
+    },
+    {
+	"pun_duration": 604,
+	"pun_id": 151,
+	"pun_label": "604 min"
+    },
+    {
+	"pun_duration": 608,
+	"pun_id": 152,
+	"pun_label": "608 min"
+    },
+    {
+	"pun_duration": 612,
+	"pun_id": 153,
+	"pun_label": "612 min"
+    },
+    {
+	"pun_duration": 616,
+	"pun_id": 154,
+	"pun_label": "616 min"
+    },
+    {
+	"pun_duration": 620,
+	"pun_id": 155,
+	"pun_label": "620 min"
+    },
+    {
+	"pun_duration": 624,
+	"pun_id": 156,
+	"pun_label": "624 min"
+    },
+    {
+	"pun_duration": 628,
+	"pun_id": 157,
+	"pun_label": "628 min"
+    },
+    {
+	"pun_duration": 632,
+	"pun_id": 158,
+	"pun_label": "632 min"
+    },
+    {
+	"pun_duration": 636,
+	"pun_id": 159,
+	"pun_label": "636 min"
+    },
+    {
+	"pun_duration": 640,
+	"pun_id": 160,
+	"pun_label": "640 min"
+    },
+    {
+	"pun_duration": 644,
+	"pun_id": 161,
+	"pun_label": "644 min"
+    },
+    {
+	"pun_duration": 648,
+	"pun_id": 162,
+	"pun_label": "648 min"
+    },
+    {
+	"pun_duration": 652,
+	"pun_id": 163,
+	"pun_label": "652 min"
+    },
+    {
+	"pun_duration": 656,
+	"pun_id": 164,
+	"pun_label": "656 min"
+    },
+    {
+	"pun_duration": 660,
+	"pun_id": 165,
+	"pun_label": "660 min"
+    },
+    {
+	"pun_duration": 664,
+	"pun_id": 166,
+	"pun_label": "664 min"
+    },
+    {
+	"pun_duration": 668,
+	"pun_id": 167,
+	"pun_label": "668 min"
+    },
+    {
+	"pun_duration": 672,
+	"pun_id": 168,
+	"pun_label": "672 min"
+    },
+    {
+	"pun_duration": 676,
+	"pun_id": 169,
+	"pun_label": "676 min"
+    },
+    {
+	"pun_duration": 680,
+	"pun_id": 170,
+	"pun_label": "680 min"
+    },
+    {
+	"pun_duration": 684,
+	"pun_id": 171,
+	"pun_label": "684 min"
+    },
+    {
+	"pun_duration": 688,
+	"pun_id": 172,
+	"pun_label": "688 min"
+    },
+    {
+	"pun_duration": 692,
+	"pun_id": 173,
+	"pun_label": "692 min"
+    },
+    {
+	"pun_duration": 696,
+	"pun_id": 174,
+	"pun_label": "696 min"
+    },
+    {
+	"pun_duration": 700,
+	"pun_id": 175,
+	"pun_label": "700 min"
+    },
+    {
+	"pun_duration": 704,
+	"pun_id": 176,
+	"pun_label": "704 min"
+    },
+    {
+	"pun_duration": 708,
+	"pun_id": 177,
+	"pun_label": "708 min"
+    },
+    {
+	"pun_duration": 712,
+	"pun_id": 178,
+	"pun_label": "712 min"
+    },
+    {
+	"pun_duration": 716,
+	"pun_id": 179,
+	"pun_label": "716 min"
+    },
+    {
+	"pun_duration": 720,
+	"pun_id": 180,
+	"pun_label": "720 min"
+    },
+    {
+	"pun_duration": 724,
+	"pun_id": 181,
+	"pun_label": "724 min"
+    },
+    {
+	"pun_duration": 728,
+	"pun_id": 182,
+	"pun_label": "728 min"
+    },
+    {
+	"pun_duration": 732,
+	"pun_id": 183,
+	"pun_label": "732 min"
+    },
+    {
+	"pun_duration": 736,
+	"pun_id": 184,
+	"pun_label": "736 min"
+    },
+    {
+	"pun_duration": 740,
+	"pun_id": 185,
+	"pun_label": "740 min"
+    },
+    {
+	"pun_duration": 744,
+	"pun_id": 186,
+	"pun_label": "744 min"
+    },
+    {
+	"pun_duration": 748,
+	"pun_id": 187,
+	"pun_label": "748 min"
+    },
+    {
+	"pun_duration": 752,
+	"pun_id": 188,
+	"pun_label": "752 min"
+    },
+    {
+	"pun_duration": 756,
+	"pun_id": 189,
+	"pun_label": "756 min"
+    },
+    {
+	"pun_duration": 760,
+	"pun_id": 190,
+	"pun_label": "760 min"
+    },
+    {
+	"pun_duration": 764,
+	"pun_id": 191,
+	"pun_label": "764 min"
+    },
+    {
+	"pun_duration": 768,
+	"pun_id": 192,
+	"pun_label": "768 min"
+    },
+    {
+	"pun_duration": 772,
+	"pun_id": 193,
+	"pun_label": "772 min"
+    },
+    {
+	"pun_duration": 776,
+	"pun_id": 194,
+	"pun_label": "776 min"
+    },
+    {
+	"pun_duration": 780,
+	"pun_id": 195,
+	"pun_label": "780 min"
+    },
+    {
+	"pun_duration": 784,
+	"pun_id": 196,
+	"pun_label": "784 min"
+    },
+    {
+	"pun_duration": 788,
+	"pun_id": 197,
+	"pun_label": "788 min"
+    },
+    {
+	"pun_duration": 792,
+	"pun_id": 198,
+	"pun_label": "792 min"
+    },
+    {
+	"pun_duration": 796,
+	"pun_id": 199,
+	"pun_label": "796 min"
+    },
+    {
+	"pun_duration": 800,
+	"pun_id": 200,
+	"pun_label": "800 min"
+    },
+    {
+	"pun_duration": 804,
+	"pun_id": 201,
+	"pun_label": "804 min"
+    },
+    {
+	"pun_duration": 808,
+	"pun_id": 202,
+	"pun_label": "808 min"
+    },
+    {
+	"pun_duration": 812,
+	"pun_id": 203,
+	"pun_label": "812 min"
+    },
+    {
+	"pun_duration": 816,
+	"pun_id": 204,
+	"pun_label": "816 min"
+    },
+    {
+	"pun_duration": 820,
+	"pun_id": 205,
+	"pun_label": "820 min"
+    },
+    {
+	"pun_duration": 824,
+	"pun_id": 206,
+	"pun_label": "824 min"
+    },
+    {
+	"pun_duration": 828,
+	"pun_id": 207,
+	"pun_label": "828 min"
+    },
+    {
+	"pun_duration": 832,
+	"pun_id": 208,
+	"pun_label": "832 min"
+    },
+    {
+	"pun_duration": 836,
+	"pun_id": 209,
+	"pun_label": "836 min"
+    },
+    {
+	"pun_duration": 840,
+	"pun_id": 210,
+	"pun_label": "840 min"
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 627,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 1,
+      "pye_label": "May - September",
+      "pye_start_month": 5,
+      "pye_start_day": 1,
+      "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
+    }
+  ]
+}
diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json
new file mode 100644
index 0000000..96985e1
--- /dev/null
+++ b/etc/psa_tariff/tariff04.json
@@ -0,0 +1,1218 @@
+{
+  "Project" : "Kleipeda",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Info"    : "Yellow Zone (center)",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "22:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "22:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "00:00:00",
+      "time_range_to": "08:00:00"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 2",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 30,
+      "comment_pop_min_time": "30mins -> 30 cent",
+      "pop_max_time": 840,
+      "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_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
+      "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,
+      "pop_business_hours": 163584,
+      "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": "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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": 840,
+            "carry_over_static_start" : "18: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,
+        "pra_price": 10
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 2,
+        "pra_price": 20
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 3,
+        "pra_price": 30
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 4,
+        "pra_price": 40
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 5,
+        "pra_price": 50
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 6,
+        "pra_price": 60
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 7,
+        "pra_price": 70
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 8,
+        "pra_price": 80
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 9,
+        "pra_price": 90
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 10,
+        "pra_price": 100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 11,
+        "pra_price": 110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 12,
+        "pra_price": 120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 13,
+        "pra_price": 130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 14,
+        "pra_price": 140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 15,
+        "pra_price": 150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 16,
+        "pra_price": 160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 17,
+        "pra_price": 170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 18,
+        "pra_price": 180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 19,
+        "pra_price": 190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 20,
+        "pra_price": 200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 21,
+        "pra_price": 210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 22,
+        "pra_price": 220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 23,
+        "pra_price": 230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 24,
+        "pra_price": 240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 25,
+        "pra_price": 250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 26,
+        "pra_price": 260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 27,
+        "pra_price": 270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 28,
+        "pra_price": 280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 29,
+        "pra_price": 290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 30,
+        "pra_price": 300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 31,
+        "pra_price": 310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 32,
+        "pra_price": 320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 33,
+        "pra_price": 330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 34,
+        "pra_price": 340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 35,
+        "pra_price": 350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 36,
+        "pra_price": 360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 37,
+        "pra_price": 370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 38,
+        "pra_price": 380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 39,
+        "pra_price": 390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 40,
+        "pra_price": 400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 41,
+        "pra_price": 410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 42,
+        "pra_price": 420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 43,
+        "pra_price": 430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 44,
+        "pra_price": 440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 45,
+        "pra_price": 450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 46,
+        "pra_price": 460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 47,
+        "pra_price": 470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 48,
+        "pra_price": 480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 49,
+        "pra_price": 490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 50,
+        "pra_price": 500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 51,
+        "pra_price": 510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 52,
+        "pra_price": 520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 53,
+        "pra_price": 530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 54,
+        "pra_price": 540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 55,
+        "pra_price": 550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 56,
+        "pra_price": 560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 57,
+        "pra_price": 570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 58,
+        "pra_price": 580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 59,
+        "pra_price": 590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 60,
+        "pra_price": 600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 61,
+        "pra_price": 610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 62,
+        "pra_price": 620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 63,
+        "pra_price": 630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 64,
+        "pra_price": 640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 65,
+        "pra_price": 650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 66,
+        "pra_price": 660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 67,
+        "pra_price": 670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 68,
+        "pra_price": 680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 69,
+        "pra_price": 690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 70,
+        "pra_price": 700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 71,
+        "pra_price": 710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 72,
+        "pra_price": 720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 73,
+        "pra_price": 730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 74,
+        "pra_price": 740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 75,
+        "pra_price": 750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 76,
+        "pra_price": 760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 77,
+        "pra_price": 770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 78,
+        "pra_price": 780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 79,
+        "pra_price": 790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 80,
+        "pra_price": 800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 81,
+        "pra_price": 810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 82,
+        "pra_price": 820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 83,
+        "pra_price": 830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 84,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
+        "pra_price": 840
+    }
+  ],
+  "Duration": [
+    {
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
+    },
+    {
+        "pun_duration": 10,
+        "pun_id": 1,
+        "pun_label": "10 min"
+    },
+    {
+        "pun_duration": 20,
+        "pun_id": 2,
+        "pun_label": "20 min"
+    },
+    {
+        "pun_duration": 30,
+        "pun_id": 3,
+        "pun_label": "30 min"
+    },
+    {
+        "pun_duration": 40,
+        "pun_id": 4,
+        "pun_label": "40 min"
+    },
+    {
+        "pun_duration": 50,
+        "pun_id": 5,
+        "pun_label": "50 min"
+    },
+    {
+        "pun_duration": 60,
+        "pun_id": 6,
+        "pun_label": "60 min"
+    },
+    {
+        "pun_duration": 70,
+        "pun_id": 7,
+        "pun_label": "70 min"
+    },
+    {
+        "pun_duration": 80,
+        "pun_id": 8,
+        "pun_label": "80 min"
+    },
+    {
+        "pun_duration": 90,
+        "pun_id": 9,
+        "pun_label": "90 min"
+    },
+    {
+        "pun_duration": 100,
+        "pun_id": 10,
+        "pun_label": "100 min"
+    },
+    {
+        "pun_duration": 110,
+        "pun_id": 11,
+        "pun_label": "110 min"
+    },
+    {
+        "pun_duration": 120,
+        "pun_id": 12,
+        "pun_label": "120 min"
+    },
+    {
+        "pun_duration": 130,
+        "pun_id": 13,
+        "pun_label": "130 min"
+    },
+    {
+        "pun_duration": 140,
+        "pun_id": 14,
+        "pun_label": "140 min"
+    },
+    {
+        "pun_duration": 150,
+        "pun_id": 15,
+        "pun_label": "150 min"
+    },
+    {
+        "pun_duration": 160,
+        "pun_id": 16,
+        "pun_label": "160 min"
+    },
+    {
+        "pun_duration": 170,
+        "pun_id": 17,
+        "pun_label": "170 min"
+    },
+    {
+        "pun_duration": 180,
+        "pun_id": 18,
+        "pun_label": "180 min"
+    },
+    {
+        "pun_duration": 190,
+        "pun_id": 19,
+        "pun_label": "190 min"
+    },
+    {
+        "pun_duration": 200,
+        "pun_id": 20,
+        "pun_label": "200 min"
+    },
+    {
+        "pun_duration": 210,
+        "pun_id": 21,
+        "pun_label": "210 min"
+    },
+    {
+        "pun_duration": 220,
+        "pun_id": 22,
+        "pun_label": "220 min"
+    },
+    {
+        "pun_duration": 230,
+        "pun_id": 23,
+        "pun_label": "230 min"
+    },
+    {
+        "pun_duration": 240,
+        "pun_id": 24,
+        "pun_label": "240 min"
+    },
+    {
+        "pun_duration": 250,
+        "pun_id": 25,
+        "pun_label": "250 min"
+    },
+    {
+        "pun_duration": 260,
+        "pun_id": 26,
+        "pun_label": "260 min"
+    },
+    {
+        "pun_duration": 270,
+        "pun_id": 27,
+        "pun_label": "270 min"
+    },
+    {
+        "pun_duration": 280,
+        "pun_id": 28,
+        "pun_label": "280 min"
+    },
+    {
+        "pun_duration": 290,
+        "pun_id": 29,
+        "pun_label": "290 min"
+    },
+    {
+        "pun_duration": 300,
+        "pun_id": 30,
+        "pun_label": "300 min"
+    },
+    {
+        "pun_duration": 310,
+        "pun_id": 31,
+        "pun_label": "310 min"
+    },
+    {
+        "pun_duration": 320,
+        "pun_id": 32,
+        "pun_label": "320 min"
+    },
+    {
+        "pun_duration": 330,
+        "pun_id": 33,
+        "pun_label": "330 min"
+    },
+    {
+        "pun_duration": 340,
+        "pun_id": 34,
+        "pun_label": "340 min"
+    },
+    {
+        "pun_duration": 350,
+        "pun_id": 35,
+        "pun_label": "350 min"
+    },
+    {
+        "pun_duration": 360,
+        "pun_id": 36,
+        "pun_label": "360 min"
+    },
+    {
+        "pun_duration": 370,
+        "pun_id": 37,
+        "pun_label": "370 min"
+    },
+    {
+        "pun_duration": 380,
+        "pun_id": 38,
+        "pun_label": "380 min"
+    },
+    {
+        "pun_duration": 390,
+        "pun_id": 39,
+        "pun_label": "390 min"
+    },
+    {
+        "pun_duration": 400,
+        "pun_id": 40,
+        "pun_label": "400 min"
+    },
+    {
+        "pun_duration": 410,
+        "pun_id": 41,
+        "pun_label": "410 min"
+    },
+    {
+        "pun_duration": 420,
+        "pun_id": 42,
+        "pun_label": "420 min"
+    },
+    {
+        "pun_duration": 430,
+        "pun_id": 43,
+        "pun_label": "430 min"
+    },
+    {
+        "pun_duration": 440,
+        "pun_id": 44,
+        "pun_label": "440 min"
+    },
+    {
+        "pun_duration": 450,
+        "pun_id": 45,
+        "pun_label": "450 min"
+    },
+    {
+        "pun_duration": 460,
+        "pun_id": 46,
+        "pun_label": "460 min"
+    },
+    {
+        "pun_duration": 470,
+        "pun_id": 47,
+        "pun_label": "470 min"
+    },
+    {
+        "pun_duration": 480,
+        "pun_id": 48,
+        "pun_label": "480 min"
+    },
+    {
+        "pun_duration": 490,
+        "pun_id": 49,
+        "pun_label": "490 min"
+    },
+    {
+        "pun_duration": 500,
+        "pun_id": 50,
+        "pun_label": "500 min"
+    },
+    {
+        "pun_duration": 510,
+        "pun_id": 51,
+        "pun_label": "510 min"
+    },
+    {
+        "pun_duration": 520,
+        "pun_id": 52,
+        "pun_label": "520 min"
+    },
+    {
+        "pun_duration": 530,
+        "pun_id": 53,
+        "pun_label": "530 min"
+    },
+    {
+        "pun_duration": 540,
+        "pun_id": 54,
+        "pun_label": "540 min"
+    },
+    {
+        "pun_duration": 550,
+        "pun_id": 55,
+        "pun_label": "550 min"
+    },
+    {
+        "pun_duration": 560,
+        "pun_id": 56,
+        "pun_label": "560 min"
+    },
+    {
+        "pun_duration": 570,
+        "pun_id": 57,
+        "pun_label": "570 min"
+    },
+    {
+        "pun_duration": 580,
+        "pun_id": 58,
+        "pun_label": "580 min"
+    },
+    {
+        "pun_duration": 590,
+        "pun_id": 59,
+        "pun_label": "590 min"
+    },
+    {
+        "pun_duration": 600,
+        "pun_id": 60,
+        "pun_label": "600 min"
+    },
+    {
+        "pun_duration": 610,
+        "pun_id": 61,
+        "pun_label": "610 min"
+    },
+    {
+        "pun_duration": 620,
+        "pun_id": 62,
+        "pun_label": "620 min"
+    },
+    {
+        "pun_duration": 630,
+        "pun_id": 63,
+        "pun_label": "630 min"
+    },
+    {
+        "pun_duration": 640,
+        "pun_id": 64,
+        "pun_label": "640 min"
+    },
+    {
+        "pun_duration": 650,
+        "pun_id": 65,
+        "pun_label": "650 min"
+    },
+    {
+        "pun_duration": 660,
+        "pun_id": 66,
+        "pun_label": "660 min"
+    },
+    {
+        "pun_duration": 670,
+        "pun_id": 67,
+        "pun_label": "670 min"
+    },
+    {
+        "pun_duration": 680,
+        "pun_id": 68,
+        "pun_label": "680 min"
+    },
+    {
+        "pun_duration": 690,
+        "pun_id": 69,
+        "pun_label": "690 min"
+    },
+    {
+        "pun_duration": 700,
+        "pun_id": 70,
+        "pun_label": "700 min"
+    },
+    {
+        "pun_duration": 710,
+        "pun_id": 71,
+        "pun_label": "710 min"
+    },
+    {
+        "pun_duration": 720,
+        "pun_id": 72,
+        "pun_label": "720 min"
+    },
+    {
+        "pun_duration": 730,
+        "pun_id": 73,
+        "pun_label": "730 min"
+    },
+    {
+        "pun_duration": 740,
+        "pun_id": 74,
+        "pun_label": "740 min"
+    },
+    {
+        "pun_duration": 750,
+        "pun_id": 75,
+        "pun_label": "750 min"
+    },
+    {
+        "pun_duration": 760,
+        "pun_id": 76,
+        "pun_label": "760 min"
+    },
+    {
+        "pun_duration": 770,
+        "pun_id": 77,
+        "pun_label": "770 min"
+    },
+    {
+        "pun_duration": 780,
+        "pun_id": 78,
+        "pun_label": "780 min"
+    },
+    {
+        "pun_duration": 790,
+        "pun_id": 79,
+        "pun_label": "790 min"
+    },
+    {
+        "pun_duration": 800,
+        "pun_id": 80,
+        "pun_label": "800 min"
+    },
+    {
+        "pun_duration": 810,
+        "pun_id": 81,
+        "pun_label": "810 min"
+    },
+    {
+        "pun_duration": 820,
+        "pun_id": 82,
+        "pun_label": "820 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 83,
+        "pun_label": "830 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 84,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 85,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 86,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 87,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 88,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 89,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 840,
+        "pun_id": 90,
+        "pun_label": "840 min"
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 1,
+      "pye_label": "May - September",
+      "pye_start_month": 5,
+      "pye_start_day": 1,
+      "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
+    }
+  ]
+}

From 93de81b036aabf65726fdb64c68e0215b4b36def Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 1 Oct 2024 12:42:24 +0200
Subject: [PATCH 12/16] tariff-files for winter-term

---
 etc/psa_tariff/tariff01.json |    2 +-
 etc/psa_tariff/tariff02.json |   70 +-
 etc/psa_tariff/tariff03.json | 2079 +++++-----------------------------
 3 files changed, 269 insertions(+), 1882 deletions(-)

diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index 2ebbc9d..b61ea58 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
   "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "Red Zone (center)",
+  "Info"    : "Red Zone",
   "Currency": [
     {
       "pcu_id": 2,
diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 6ea270d..6e3b5ba 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -60,7 +60,7 @@
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
       "pop_max_price": 840,
-      "pop_plus_steps": 10,
+      "pop_plus_steps": 6,
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
@@ -656,44 +656,14 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 84,
-        "pra_price": 0
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 85,
-        "pra_price": 0
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 86,
-        "pra_price": 0
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 87,
-        "pra_price": 0
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 88,
-        "pra_price": 0
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 89,
-        "pra_price": 0
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 90,
         "pra_price": 840
     }
   ],
   "Duration": [
     {
-	"pun_duration": 0,
-	"pun_id": 0,
-	"pun_label": "0 min"
+	     "pun_duration": 0,
+	     "pun_id": 0,
+	     "pun_label": "0 min"
     },
     {
         "pun_duration": 10,
@@ -1110,39 +1080,9 @@
         "pun_id": 83,
         "pun_label": "830 min"
     },
-    {
-        "pun_duration": 830,
-        "pun_id": 84,
-        "pun_label": "840 min"
-    },
-    {
-        "pun_duration": 830,
-        "pun_id": 85,
-        "pun_label": "840 min"
-    },
-    {
-        "pun_duration": 830,
-        "pun_id": 86,
-        "pun_label": "840 min"
-    },
-    {
-        "pun_duration": 830,
-        "pun_id": 87,
-        "pun_label": "840 min"
-    },
-    {
-        "pun_duration": 830,
-        "pun_id": 88,
-        "pun_label": "840 min"
-    },
-    {
-        "pun_duration": 830,
-        "pun_id": 89,
-        "pun_label": "840 min"
-    },
     {
         "pun_duration": 840,
-        "pun_id": 90,
+        "pun_id": 84,
         "pun_label": "840 min"
     }
   ],
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
index b61ea58..950209a 100644
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,7 +1,12 @@
 {
-  "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "Red Zone",
+  "Project" :   "SV Bad Neuenahr",
+  "Version" :   "1.0.1+2024-09-10T16:15:20",
+  "Info"    :   "Langzeitparktarif",
+  "comment_1": 	"20mins free (broetchentaste)",
+  "comment_2": 	"every following 20mins: 0,40 euro",
+  "comment_3": 	"24h-ticket: 5,00 euro",
+  "comment_4":  "3x 24h ticket: 12,50 euro",
+  "comment_5":  "7x 24h ticket: 25,00 euro",
   "Currency": [
     {
       "pcu_id": 2,
@@ -32,28 +37,38 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "18:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "18:00:00"
     },
     {
       "time_range_id": 3,
+      "time_range_from": "08:00:00",
+      "time_range_to": "18:00:00"
+    },
+    {
+      "time_range_id": 4,
       "time_range_from": "00:00:00",
       "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 5,
+      "time_range_from": "18:00:00",
+      "time_range_to": "23:59:00"
     }
   ],
   "Prepaid": [
     {
-        "prepaid_id": 1,
+        "prepaid_id": 4,
         "prepaid_anytime": true,
         "prepaid_never": false
     },
     {
-        "prepaid_id": 2,
+        "prepaid_id": 5,
         "prepaid_anytime": false,
         "prepaid_never": true
     },
@@ -61,8 +76,62 @@
         "prepaid_id": 3,
         "prepaid_anytime": false,
         "prepaid_never": false,
-        "prepaid_static_start": "22:00:00",
+        "prepaid_static_start": "18:00:00",
         "prepaid_static_end": "08:00:00"
+    },
+    {
+        "prepaid_id" : 1,
+        "prepaid_week" : [
+            {
+                "prepaid_day" : 1,
+                "prepaid_day_comment" : "Monday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            },
+            {
+                "prepaid_day" : 2,
+                "prepaid_day_comment" : "Tuesday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            },
+            {
+                "prepaid_day" : 3,
+                "prepaid_day_comment" : "Wednesday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            },
+            {
+                "prepaid_day" : 4,
+                "prepaid_day_comment" : "Thursday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            },
+            {
+                "prepaid_day" : 5,
+                "prepaid_day_comment" : "Friday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            },
+            {
+                "prepaid_day" : 6,
+                "prepaid_day_comment" : "Saturday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            },
+            {
+                "prepaid_day" : 7,
+                "prepaid_day_comment" : "Sunday",
+                "prepaid_duration": 840,
+                "prepaid_static_start" : "18:00:00",
+                "prepaid_static_end": "08:00:00"
+            }
+        ]
     }
   ],
   "CarryOver": [
@@ -74,8 +143,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -83,8 +152,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -92,8 +161,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -101,8 +170,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -110,8 +179,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -119,8 +188,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           },
           {
@@ -128,76 +197,8 @@
             "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_duration": 840,
+            "carry_over_static_start" : "18:00:00",
             "carry_over_static_end": "08:00:00"
           }
       ]
@@ -211,25 +212,25 @@
       "pop_day_end_time": "00:00:00",
       "pop_day_night_end_time": "00:00:00",
       "pop_price_night": 0,
-      "pop_min_time": 12,
-      "comment_pop_min_time": "12mins -> 30 cent",
-      "pop_max_time": 840,
-      "comment_pop_max_time": "840mins = 14h -> 21 euros",
-      "pop_min_price": 30,
-      "pop_max_price": 2100,
-      "pop_plus_steps": 10,
+      "pop_min_time": 20,
+      "pop_max_time": 10080,
+      "pop_max_price": 2500,
+      "pop_plus_steps": 4,
       "pop_minus_steps": 1,
+      "pop_min_price": 0,
       "pop_time_step_config": 1,
-      "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
       "pop_carry_over": 1,
       "pop_carry_over_option_id": 1,
+      "pop_apply_carry_over_to_ticket_endtime" : true,
+      "pop_apply_carry_over_to_ticket_endtime_comment_1" : "if end-time touches carry-over-time-range",
+      "pop_apply_carry_over_to_ticket_endtime_comment_2" : "add carry-over-time-range to end-time",
       "pop_prepaid_option_id" : 3,
       "pop_carry_over_time_range": 1,
       "pop_carry_over_start_time_range": 2,
       "pop_carry_over_end_time_range": 3,
+      "pop_daily_card_price": 500,
       "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
+      "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours"
     }
   ],
   "PaymentRate": [
@@ -486,1864 +487,318 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 50,
-        "pra_price": 500
+        "pra_price": 500,
+        "pra_comment": "24h-ticket"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 51,
-        "pra_price": 510
+        "pra_price": 500,
+        "pra_comment": "24h-ticket"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 52,
-        "pra_price": 520
+        "pra_price": 500,
+        "pra_comment": "24h-ticket"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 53,
-        "pra_price": 530
+        "pra_price": 0,
+        "pra_comment": "dummy"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 54,
-        "pra_price": 540
+        "pra_price": 0,
+        "pra_comment": "dummy"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 55,
-        "pra_price": 550
+        "pra_price": 0,
+        "pra_comment": "dummy"
     },
     {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 56,
-        "pra_price": 560
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 56,
+      "pra_price": 1250,
+      "pra_comment": "3x24h-ticket"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 57,
-        "pra_price": 570
+        "pra_price": 0,
+        "pra_comment": "dummy"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 58,
-        "pra_price": 580
+        "pra_price": 0,
+        "pra_comment": "dummy"
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 59,
-        "pra_price": 590
+        "pra_price": 0,
+        "pra_comment": "dummy"
     },
     {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 60,
-        "pra_price": 600
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 61,
-        "pra_price": 610
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 62,
-        "pra_price": 620
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 63,
-        "pra_price": 630
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 64,
-        "pra_price": 640
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 65,
-        "pra_price": 650
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 66,
-        "pra_price": 660
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 67,
-        "pra_price": 670
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 68,
-        "pra_price": 680
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 69,
-        "pra_price": 690
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 70,
-        "pra_price": 700
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 71,
-        "pra_price": 710
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 72,
-        "pra_price": 720
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 73,
-        "pra_price": 730
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 74,
-        "pra_price": 740
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 75,
-        "pra_price": 750
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 76,
-        "pra_price": 760
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 77,
-        "pra_price": 770
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 78,
-        "pra_price": 780
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 79,
-        "pra_price": 790
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 80,
-        "pra_price": 800
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 81,
-        "pra_price": 810
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 82,
-        "pra_price": 820
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 83,
-        "pra_price": 830
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 84,
-        "pra_price": 840
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 85,
-        "pra_price": 850
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 86,
-        "pra_price": 860
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 87,
-        "pra_price": 870
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 88,
-        "pra_price": 880
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 89,
-        "pra_price": 890
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 90,
-        "pra_price": 900
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 91,
-        "pra_price": 910
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 92,
-        "pra_price": 920
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 93,
-        "pra_price": 930
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 94,
-        "pra_price": 940
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 95,
-        "pra_price": 950
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 96,
-        "pra_price": 960
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 97,
-        "pra_price": 970
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 98,
-        "pra_price": 980
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 99,
-        "pra_price": 990
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 100,
-        "pra_price": 1000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 101,
-        "pra_price": 1010
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 102,
-        "pra_price": 1020
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 103,
-        "pra_price": 1030
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 104,
-        "pra_price": 1040
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 105,
-        "pra_price": 1050
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 106,
-        "pra_price": 1060
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 107,
-        "pra_price": 1070
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 108,
-        "pra_price": 1080
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 109,
-        "pra_price": 1090
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 110,
-        "pra_price": 1100
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 111,
-        "pra_price": 1110
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 112,
-        "pra_price": 1120
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 113,
-        "pra_price": 1130
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 114,
-        "pra_price": 1140
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 115,
-        "pra_price": 1150
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 116,
-        "pra_price": 1160
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 117,
-        "pra_price": 1170
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 118,
-        "pra_price": 1180
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 119,
-        "pra_price": 1190
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 120,
-        "pra_price": 1200
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 121,
-        "pra_price": 1210
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 122,
-        "pra_price": 1220
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 123,
-        "pra_price": 1230
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 124,
-        "pra_price": 1240
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 125,
-        "pra_price": 1250
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 126,
-        "pra_price": 1260
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 127,
-        "pra_price": 1270
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 128,
-        "pra_price": 1280
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 129,
-        "pra_price": 1290
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 130,
-        "pra_price": 1300
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 131,
-        "pra_price": 1310
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 132,
-        "pra_price": 1320
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 133,
-        "pra_price": 1330
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 134,
-        "pra_price": 1340
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 135,
-        "pra_price": 1350
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 136,
-        "pra_price": 1360
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 137,
-        "pra_price": 1370
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 138,
-        "pra_price": 1380
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 139,
-        "pra_price": 1390
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 140,
-        "pra_price": 1400
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 141,
-        "pra_price": 1410
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 142,
-        "pra_price": 1420
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 143,
-        "pra_price": 1430
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 144,
-        "pra_price": 1440
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 145,
-        "pra_price": 1450
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 146,
-        "pra_price": 1460
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 147,
-        "pra_price": 1470
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 148,
-        "pra_price": 1480
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 149,
-        "pra_price": 1490
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 150,
-        "pra_price": 1500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 151,
-        "pra_price": 1510
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 152,
-        "pra_price": 1520
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 153,
-        "pra_price": 1530
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 154,
-        "pra_price": 1540
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 155,
-        "pra_price": 1550
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 156,
-        "pra_price": 1560
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 157,
-        "pra_price": 1570
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 158,
-        "pra_price": 1580
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 159,
-        "pra_price": 1590
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 160,
-        "pra_price": 1600
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 161,
-        "pra_price": 1610
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 162,
-        "pra_price": 1620
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 163,
-        "pra_price": 1630
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 164,
-        "pra_price": 1640
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 165,
-        "pra_price": 1650
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 166,
-        "pra_price": 1660
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 167,
-        "pra_price": 1670
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 168,
-        "pra_price": 1680
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 169,
-        "pra_price": 1690
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 170,
-        "pra_price": 1700
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 171,
-        "pra_price": 1710
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 172,
-        "pra_price": 1720
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 173,
-        "pra_price": 1730
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 174,
-        "pra_price": 1740
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 175,
-        "pra_price": 1750
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 176,
-        "pra_price": 1760
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 177,
-        "pra_price": 1770
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 178,
-        "pra_price": 1780
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 179,
-        "pra_price": 1790
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 180,
-        "pra_price": 1800
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 181,
-        "pra_price": 1810
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 182,
-        "pra_price": 1820
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 183,
-        "pra_price": 1830
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 184,
-        "pra_price": 1840
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 185,
-        "pra_price": 1850
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 186,
-        "pra_price": 1860
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 187,
-        "pra_price": 1870
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 188,
-        "pra_price": 1880
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 189,
-        "pra_price": 1890
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 190,
-        "pra_price": 1900
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 191,
-        "pra_price": 1910
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 192,
-        "pra_price": 1920
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 193,
-        "pra_price": 1930
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 194,
-        "pra_price": 1940
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 195,
-        "pra_price": 1950
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 196,
-        "pra_price": 1960
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 197,
-        "pra_price": 1970
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 198,
-        "pra_price": 1980
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 199,
-        "pra_price": 1990
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 200,
-        "pra_price": 2000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 201,
-        "pra_price": 2010
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 202,
-        "pra_price": 2020
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 203,
-        "pra_price": 2030
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 204,
-        "pra_price": 2040
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 205,
-        "pra_price": 2050
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 206,
-        "pra_price": 2060
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 207,
-        "pra_price": 2070
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 208,
-        "pra_price": 2080
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 209,
-        "pra_price": 2090
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 210,
-        "pra_price": 2100
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 60,
+      "pra_price": 2500,
+      "pra_comment": "7x24h-ticket"
     }
   ],
   "Duration": [
     {
-	"pun_duration": 0,
-	"pun_id": 0,
-	"pun_label": "0 min"
+      "pun_id": 0,
+      "pun_duration": 20
     },
     {
-	"pun_duration": 4,
-	"pun_id": 1,
-	"pun_label": "4 min"
+      "pun_id": 1,
+      "pun_duration": 25
     },
     {
-	"pun_duration": 8,
-	"pun_id": 2,
-	"pun_label": "8 min"
+      "pun_id": 2,
+      "pun_duration": 30
     },
     {
-	"pun_duration": 12,
-	"pun_id": 3,
-	"pun_label": "12 min"
+      "pun_id": 3,
+      "pun_duration": 35
     },
     {
-	"pun_duration": 16,
-	"pun_id": 4,
-	"pun_label": "16 min"
+      "pun_id": 4,
+      "pun_duration": 40
     },
     {
-	"pun_duration": 20,
-	"pun_id": 5,
-	"pun_label": "20 min"
+      "pun_id": 5,
+      "pun_duration": 45
     },
     {
-	"pun_duration": 24,
-	"pun_id": 6,
-	"pun_label": "24 min"
+      "pun_id": 6,
+      "pun_duration": 50
     },
     {
-	"pun_duration": 28,
-	"pun_id": 7,
-	"pun_label": "28 min"
+      "pun_id": 7,
+      "pun_duration": 55
     },
     {
-	"pun_duration": 32,
-	"pun_id": 8,
-	"pun_label": "32 min"
+      "pun_id": 8,
+      "pun_duration": 60
     },
     {
-	"pun_duration": 36,
-	"pun_id": 9,
-	"pun_label": "36 min"
+      "pun_id": 9,
+      "pun_duration": 65
     },
     {
-	"pun_duration": 40,
-	"pun_id": 10,
-	"pun_label": "40 min"
+      "pun_id": 10,
+      "pun_duration": 70
     },
     {
-	"pun_duration": 44,
-	"pun_id": 11,
-	"pun_label": "44 min"
+      "pun_id": 11,
+      "pun_duration": 75
     },
     {
-	"pun_duration": 48,
-	"pun_id": 12,
-	"pun_label": "48 min"
+      "pun_id": 12,
+      "pun_duration": 80
     },
     {
-	"pun_duration": 52,
-	"pun_id": 13,
-	"pun_label": "52 min"
+      "pun_id": 13,
+      "pun_duration": 85
     },
     {
-	"pun_duration": 56,
-	"pun_id": 14,
-	"pun_label": "56 min"
+      "pun_id": 14,
+      "pun_duration": 90
     },
     {
-	"pun_duration": 60,
-	"pun_id": 15,
-	"pun_label": "60 min"
+      "pun_id": 15,
+      "pun_duration": 95
     },
     {
-	"pun_duration": 64,
-	"pun_id": 16,
-	"pun_label": "64 min"
+      "pun_id": 16,
+      "pun_duration": 100
     },
     {
-	"pun_duration": 68,
-	"pun_id": 17,
-	"pun_label": "68 min"
+      "pun_id": 17,
+      "pun_duration": 105
     },
     {
-	"pun_duration": 72,
-	"pun_id": 18,
-	"pun_label": "72 min"
+      "pun_id": 18,
+      "pun_duration": 110
     },
     {
-	"pun_duration": 76,
-	"pun_id": 19,
-	"pun_label": "76 min"
+      "pun_id": 19,
+      "pun_duration": 115
     },
     {
-	"pun_duration": 80,
-	"pun_id": 20,
-	"pun_label": "80 min"
+      "pun_id": 20,
+      "pun_duration": 120
     },
     {
-	"pun_duration": 84,
-	"pun_id": 21,
-	"pun_label": "84 min"
+      "pun_id": 21,
+      "pun_duration": 125
     },
     {
-	"pun_duration": 88,
-	"pun_id": 22,
-	"pun_label": "88 min"
+      "pun_id": 22,
+      "pun_duration": 130
     },
     {
-	"pun_duration": 92,
-	"pun_id": 23,
-	"pun_label": "92 min"
+      "pun_id": 23,
+      "pun_duration": 135
     },
     {
-	"pun_duration": 96,
-	"pun_id": 24,
-	"pun_label": "96 min"
+      "pun_id": 24,
+      "pun_duration": 140
     },
     {
-	"pun_duration": 100,
-	"pun_id": 25,
-	"pun_label": "100 min"
+      "pun_id": 25,
+      "pun_duration": 145
     },
     {
-	"pun_duration": 104,
-	"pun_id": 26,
-	"pun_label": "104 min"
+      "pun_id": 26,
+      "pun_duration": 150
     },
     {
-	"pun_duration": 108,
-	"pun_id": 27,
-	"pun_label": "108 min"
+      "pun_id": 27,
+      "pun_duration": 155
     },
     {
-	"pun_duration": 112,
-	"pun_id": 28,
-	"pun_label": "112 min"
+      "pun_id": 28,
+      "pun_duration": 160
     },
     {
-	"pun_duration": 116,
-	"pun_id": 29,
-	"pun_label": "116 min"
+      "pun_id": 29,
+      "pun_duration": 165
     },
     {
-	"pun_duration": 120,
-	"pun_id": 30,
-	"pun_label": "120 min"
+      "pun_id": 30,
+      "pun_duration": 170
     },
     {
-	"pun_duration": 124,
-	"pun_id": 31,
-	"pun_label": "124 min"
+      "pun_id": 31,
+      "pun_duration": 175
     },
     {
-	"pun_duration": 128,
-	"pun_id": 32,
-	"pun_label": "128 min"
+      "pun_id": 32,
+      "pun_duration": 180
     },
     {
-	"pun_duration": 132,
-	"pun_id": 33,
-	"pun_label": "132 min"
+      "pun_id": 33,
+      "pun_duration": 185
     },
     {
-	"pun_duration": 136,
-	"pun_id": 34,
-	"pun_label": "136 min"
+      "pun_id": 34,
+      "pun_duration": 190
     },
     {
-	"pun_duration": 140,
-	"pun_id": 35,
-	"pun_label": "140 min"
+      "pun_id": 35,
+      "pun_duration": 195
     },
     {
-	"pun_duration": 144,
-	"pun_id": 36,
-	"pun_label": "144 min"
+      "pun_id": 36,
+      "pun_duration": 200
     },
     {
-	"pun_duration": 148,
-	"pun_id": 37,
-	"pun_label": "148 min"
+      "pun_id": 37,
+      "pun_duration": 205
     },
     {
-	"pun_duration": 152,
-	"pun_id": 38,
-	"pun_label": "152 min"
+      "pun_id": 38,
+      "pun_duration": 210
     },
     {
-	"pun_duration": 156,
-	"pun_id": 39,
-	"pun_label": "156 min"
+      "pun_id": 39,
+      "pun_duration": 215
     },
     {
-	"pun_duration": 160,
-	"pun_id": 40,
-	"pun_label": "160 min"
+      "pun_id": 40,
+      "pun_duration": 220
     },
     {
-	"pun_duration": 164,
-	"pun_id": 41,
-	"pun_label": "164 min"
+      "pun_id": 41,
+      "pun_duration": 225
     },
     {
-	"pun_duration": 168,
-	"pun_id": 42,
-	"pun_label": "168 min"
+      "pun_id": 42,
+      "pun_duration": 230
     },
     {
-	"pun_duration": 172,
-	"pun_id": 43,
-	"pun_label": "172 min"
+      "pun_id": 43,
+      "pun_duration": 235
     },
     {
-	"pun_duration": 176,
-	"pun_id": 44,
-	"pun_label": "176 min"
+      "pun_id": 44,
+      "pun_duration": 240
     },
     {
-	"pun_duration": 180,
-	"pun_id": 45,
-	"pun_label": "180 min"
+      "pun_id": 45,
+      "pun_duration": 245
     },
     {
-	"pun_duration": 184,
-	"pun_id": 46,
-	"pun_label": "184 min"
+      "pun_id": 46,
+      "pun_duration": 250
     },
     {
-	"pun_duration": 188,
-	"pun_id": 47,
-	"pun_label": "188 min"
+      "pun_id": 47,
+      "pun_duration": 255
     },
     {
-	"pun_duration": 192,
-	"pun_id": 48,
-	"pun_label": "192 min"
+      "pun_id": 48,
+      "pun_duration": 260
     },
     {
-	"pun_duration": 196,
-	"pun_id": 49,
-	"pun_label": "196 min"
+      "pun_id": 49,
+      "pun_duration": 265
     },
     {
-	"pun_duration": 200,
-	"pun_id": 50,
-	"pun_label": "200 min"
+      "pun_id": 50,
+      "pun_duration": 265
     },
     {
-	"pun_duration": 204,
-	"pun_id": 51,
-	"pun_label": "204 min"
+      "pun_id": 51,
+      "pun_duration": 265
     },
     {
-	"pun_duration": 208,
-	"pun_id": 52,
-	"pun_label": "208 min"
+      "pun_id": 52,
+      "pun_duration": 600
     },
     {
-	"pun_duration": 212,
-	"pun_id": 53,
-	"pun_label": "212 min"
+      "pun_id": 53,
+      "pun_duration": 600
     },
     {
-	"pun_duration": 216,
-	"pun_id": 54,
-	"pun_label": "216 min"
+      "pun_id": 54,
+      "pun_duration": 600
     },
     {
-	"pun_duration": 220,
-	"pun_id": 55,
-	"pun_label": "220 min"
+      "pun_id": 54,
+      "pun_duration": 600
     },
     {
-	"pun_duration": 224,
-	"pun_id": 56,
-	"pun_label": "224 min"
+      "pun_id": 55,
+      "pun_duration": 600
     },
     {
-	"pun_duration": 228,
-	"pun_id": 57,
-	"pun_label": "228 min"
+      "pun_id": 56,
+      "pun_duration": 3480
     },
     {
-	"pun_duration": 232,
-	"pun_id": 58,
-	"pun_label": "232 min"
+      "pun_id": 57,
+      "pun_duration": 3480
     },
     {
-	"pun_duration": 236,
-	"pun_id": 59,
-	"pun_label": "236 min"
+      "pun_id": 58,
+      "pun_duration": 3480
     },
     {
-	"pun_duration": 240,
-	"pun_id": 60,
-	"pun_label": "240 min"
+      "pun_id": 59,
+      "pun_duration": 3480
     },
     {
-	"pun_duration": 244,
-	"pun_id": 61,
-	"pun_label": "244 min"
-    },
-    {
-	"pun_duration": 248,
-	"pun_id": 62,
-	"pun_label": "248 min"
-    },
-    {
-	"pun_duration": 252,
-	"pun_id": 63,
-	"pun_label": "252 min"
-    },
-    {
-	"pun_duration": 256,
-	"pun_id": 64,
-	"pun_label": "256 min"
-    },
-    {
-	"pun_duration": 260,
-	"pun_id": 65,
-	"pun_label": "260 min"
-    },
-    {
-	"pun_duration": 264,
-	"pun_id": 66,
-	"pun_label": "264 min"
-    },
-    {
-	"pun_duration": 268,
-	"pun_id": 67,
-	"pun_label": "268 min"
-    },
-    {
-	"pun_duration": 272,
-	"pun_id": 68,
-	"pun_label": "272 min"
-    },
-    {
-	"pun_duration": 276,
-	"pun_id": 69,
-	"pun_label": "276 min"
-    },
-    {
-	"pun_duration": 280,
-	"pun_id": 70,
-	"pun_label": "280 min"
-    },
-    {
-	"pun_duration": 284,
-	"pun_id": 71,
-	"pun_label": "284 min"
-    },
-    {
-	"pun_duration": 288,
-	"pun_id": 72,
-	"pun_label": "288 min"
-    },
-    {
-	"pun_duration": 292,
-	"pun_id": 73,
-	"pun_label": "292 min"
-    },
-    {
-	"pun_duration": 296,
-	"pun_id": 74,
-	"pun_label": "296 min"
-    },
-    {
-	"pun_duration": 300,
-	"pun_id": 75,
-	"pun_label": "300 min"
-    },
-    {
-	"pun_duration": 304,
-	"pun_id": 76,
-	"pun_label": "304 min"
-    },
-    {
-	"pun_duration": 308,
-	"pun_id": 77,
-	"pun_label": "308 min"
-    },
-    {
-	"pun_duration": 312,
-	"pun_id": 78,
-	"pun_label": "312 min"
-    },
-    {
-	"pun_duration": 316,
-	"pun_id": 79,
-	"pun_label": "316 min"
-    },
-    {
-	"pun_duration": 320,
-	"pun_id": 80,
-	"pun_label": "320 min"
-    },
-    {
-	"pun_duration": 324,
-	"pun_id": 81,
-	"pun_label": "324 min"
-    },
-    {
-	"pun_duration": 328,
-	"pun_id": 82,
-	"pun_label": "328 min"
-    },
-    {
-	"pun_duration": 332,
-	"pun_id": 83,
-	"pun_label": "332 min"
-    },
-    {
-	"pun_duration": 336,
-	"pun_id": 84,
-	"pun_label": "336 min"
-    },
-    {
-	"pun_duration": 340,
-	"pun_id": 85,
-	"pun_label": "340 min"
-    },
-    {
-	"pun_duration": 344,
-	"pun_id": 86,
-	"pun_label": "344 min"
-    },
-    {
-	"pun_duration": 348,
-	"pun_id": 87,
-	"pun_label": "348 min"
-    },
-    {
-	"pun_duration": 352,
-	"pun_id": 88,
-	"pun_label": "352 min"
-    },
-    {
-	"pun_duration": 356,
-	"pun_id": 89,
-	"pun_label": "356 min"
-    },
-    {
-	"pun_duration": 360,
-	"pun_id": 90,
-	"pun_label": "360 min"
-    },
-    {
-	"pun_duration": 364,
-	"pun_id": 91,
-	"pun_label": "364 min"
-    },
-    {
-	"pun_duration": 368,
-	"pun_id": 92,
-	"pun_label": "368 min"
-    },
-    {
-	"pun_duration": 372,
-	"pun_id": 93,
-	"pun_label": "372 min"
-    },
-    {
-	"pun_duration": 376,
-	"pun_id": 94,
-	"pun_label": "376 min"
-    },
-    {
-	"pun_duration": 380,
-	"pun_id": 95,
-	"pun_label": "380 min"
-    },
-    {
-	"pun_duration": 384,
-	"pun_id": 96,
-	"pun_label": "384 min"
-    },
-    {
-	"pun_duration": 388,
-	"pun_id": 97,
-	"pun_label": "388 min"
-    },
-    {
-	"pun_duration": 392,
-	"pun_id": 98,
-	"pun_label": "392 min"
-    },
-    {
-	"pun_duration": 396,
-	"pun_id": 99,
-	"pun_label": "396 min"
-    },
-    {
-	"pun_duration": 400,
-	"pun_id": 100,
-	"pun_label": "400 min"
-    },
-    {
-	"pun_duration": 404,
-	"pun_id": 101,
-	"pun_label": "404 min"
-    },
-    {
-	"pun_duration": 408,
-	"pun_id": 102,
-	"pun_label": "408 min"
-    },
-    {
-	"pun_duration": 412,
-	"pun_id": 103,
-	"pun_label": "412 min"
-    },
-    {
-	"pun_duration": 416,
-	"pun_id": 104,
-	"pun_label": "416 min"
-    },
-    {
-	"pun_duration": 420,
-	"pun_id": 105,
-	"pun_label": "420 min"
-    },
-    {
-	"pun_duration": 424,
-	"pun_id": 106,
-	"pun_label": "424 min"
-    },
-    {
-	"pun_duration": 428,
-	"pun_id": 107,
-	"pun_label": "428 min"
-    },
-    {
-	"pun_duration": 432,
-	"pun_id": 108,
-	"pun_label": "432 min"
-    },
-    {
-	"pun_duration": 436,
-	"pun_id": 109,
-	"pun_label": "436 min"
-    },
-    {
-	"pun_duration": 440,
-	"pun_id": 110,
-	"pun_label": "440 min"
-    },
-    {
-	"pun_duration": 444,
-	"pun_id": 111,
-	"pun_label": "444 min"
-    },
-    {
-	"pun_duration": 448,
-	"pun_id": 112,
-	"pun_label": "448 min"
-    },
-    {
-	"pun_duration": 452,
-	"pun_id": 113,
-	"pun_label": "452 min"
-    },
-    {
-	"pun_duration": 456,
-	"pun_id": 114,
-	"pun_label": "456 min"
-    },
-    {
-	"pun_duration": 460,
-	"pun_id": 115,
-	"pun_label": "460 min"
-    },
-    {
-	"pun_duration": 464,
-	"pun_id": 116,
-	"pun_label": "464 min"
-    },
-    {
-	"pun_duration": 468,
-	"pun_id": 117,
-	"pun_label": "468 min"
-    },
-    {
-	"pun_duration": 472,
-	"pun_id": 118,
-	"pun_label": "472 min"
-    },
-    {
-	"pun_duration": 476,
-	"pun_id": 119,
-	"pun_label": "476 min"
-    },
-    {
-	"pun_duration": 480,
-	"pun_id": 120,
-	"pun_label": "480 min"
-    },
-    {
-	"pun_duration": 484,
-	"pun_id": 121,
-	"pun_label": "484 min"
-    },
-    {
-	"pun_duration": 488,
-	"pun_id": 122,
-	"pun_label": "488 min"
-    },
-    {
-	"pun_duration": 492,
-	"pun_id": 123,
-	"pun_label": "492 min"
-    },
-    {
-	"pun_duration": 496,
-	"pun_id": 124,
-	"pun_label": "496 min"
-    },
-    {
-	"pun_duration": 500,
-	"pun_id": 125,
-	"pun_label": "500 min"
-    },
-    {
-	"pun_duration": 504,
-	"pun_id": 126,
-	"pun_label": "504 min"
-    },
-    {
-	"pun_duration": 508,
-	"pun_id": 127,
-	"pun_label": "508 min"
-    },
-    {
-	"pun_duration": 512,
-	"pun_id": 128,
-	"pun_label": "512 min"
-    },
-    {
-	"pun_duration": 516,
-	"pun_id": 129,
-	"pun_label": "516 min"
-    },
-    {
-	"pun_duration": 520,
-	"pun_id": 130,
-	"pun_label": "520 min"
-    },
-    {
-	"pun_duration": 524,
-	"pun_id": 131,
-	"pun_label": "524 min"
-    },
-    {
-	"pun_duration": 528,
-	"pun_id": 132,
-	"pun_label": "528 min"
-    },
-    {
-	"pun_duration": 532,
-	"pun_id": 133,
-	"pun_label": "532 min"
-    },
-    {
-	"pun_duration": 536,
-	"pun_id": 134,
-	"pun_label": "536 min"
-    },
-    {
-	"pun_duration": 540,
-	"pun_id": 135,
-	"pun_label": "540 min"
-    },
-    {
-	"pun_duration": 544,
-	"pun_id": 136,
-	"pun_label": "544 min"
-    },
-    {
-	"pun_duration": 548,
-	"pun_id": 137,
-	"pun_label": "548 min"
-    },
-    {
-	"pun_duration": 552,
-	"pun_id": 138,
-	"pun_label": "552 min"
-    },
-    {
-	"pun_duration": 556,
-	"pun_id": 139,
-	"pun_label": "556 min"
-    },
-    {
-	"pun_duration": 560,
-	"pun_id": 140,
-	"pun_label": "560 min"
-    },
-    {
-	"pun_duration": 564,
-	"pun_id": 141,
-	"pun_label": "564 min"
-    },
-    {
-	"pun_duration": 568,
-	"pun_id": 142,
-	"pun_label": "568 min"
-    },
-    {
-	"pun_duration": 572,
-	"pun_id": 143,
-	"pun_label": "572 min"
-    },
-    {
-	"pun_duration": 576,
-	"pun_id": 144,
-	"pun_label": "576 min"
-    },
-    {
-	"pun_duration": 580,
-	"pun_id": 145,
-	"pun_label": "580 min"
-    },
-    {
-	"pun_duration": 584,
-	"pun_id": 146,
-	"pun_label": "584 min"
-    },
-    {
-	"pun_duration": 588,
-	"pun_id": 147,
-	"pun_label": "588 min"
-    },
-    {
-	"pun_duration": 592,
-	"pun_id": 148,
-	"pun_label": "592 min"
-    },
-    {
-	"pun_duration": 596,
-	"pun_id": 149,
-	"pun_label": "596 min"
-    },
-    {
-	"pun_duration": 600,
-	"pun_id": 150,
-	"pun_label": "600 min"
-    },
-    {
-	"pun_duration": 604,
-	"pun_id": 151,
-	"pun_label": "604 min"
-    },
-    {
-	"pun_duration": 608,
-	"pun_id": 152,
-	"pun_label": "608 min"
-    },
-    {
-	"pun_duration": 612,
-	"pun_id": 153,
-	"pun_label": "612 min"
-    },
-    {
-	"pun_duration": 616,
-	"pun_id": 154,
-	"pun_label": "616 min"
-    },
-    {
-	"pun_duration": 620,
-	"pun_id": 155,
-	"pun_label": "620 min"
-    },
-    {
-	"pun_duration": 624,
-	"pun_id": 156,
-	"pun_label": "624 min"
-    },
-    {
-	"pun_duration": 628,
-	"pun_id": 157,
-	"pun_label": "628 min"
-    },
-    {
-	"pun_duration": 632,
-	"pun_id": 158,
-	"pun_label": "632 min"
-    },
-    {
-	"pun_duration": 636,
-	"pun_id": 159,
-	"pun_label": "636 min"
-    },
-    {
-	"pun_duration": 640,
-	"pun_id": 160,
-	"pun_label": "640 min"
-    },
-    {
-	"pun_duration": 644,
-	"pun_id": 161,
-	"pun_label": "644 min"
-    },
-    {
-	"pun_duration": 648,
-	"pun_id": 162,
-	"pun_label": "648 min"
-    },
-    {
-	"pun_duration": 652,
-	"pun_id": 163,
-	"pun_label": "652 min"
-    },
-    {
-	"pun_duration": 656,
-	"pun_id": 164,
-	"pun_label": "656 min"
-    },
-    {
-	"pun_duration": 660,
-	"pun_id": 165,
-	"pun_label": "660 min"
-    },
-    {
-	"pun_duration": 664,
-	"pun_id": 166,
-	"pun_label": "664 min"
-    },
-    {
-	"pun_duration": 668,
-	"pun_id": 167,
-	"pun_label": "668 min"
-    },
-    {
-	"pun_duration": 672,
-	"pun_id": 168,
-	"pun_label": "672 min"
-    },
-    {
-	"pun_duration": 676,
-	"pun_id": 169,
-	"pun_label": "676 min"
-    },
-    {
-	"pun_duration": 680,
-	"pun_id": 170,
-	"pun_label": "680 min"
-    },
-    {
-	"pun_duration": 684,
-	"pun_id": 171,
-	"pun_label": "684 min"
-    },
-    {
-	"pun_duration": 688,
-	"pun_id": 172,
-	"pun_label": "688 min"
-    },
-    {
-	"pun_duration": 692,
-	"pun_id": 173,
-	"pun_label": "692 min"
-    },
-    {
-	"pun_duration": 696,
-	"pun_id": 174,
-	"pun_label": "696 min"
-    },
-    {
-	"pun_duration": 700,
-	"pun_id": 175,
-	"pun_label": "700 min"
-    },
-    {
-	"pun_duration": 704,
-	"pun_id": 176,
-	"pun_label": "704 min"
-    },
-    {
-	"pun_duration": 708,
-	"pun_id": 177,
-	"pun_label": "708 min"
-    },
-    {
-	"pun_duration": 712,
-	"pun_id": 178,
-	"pun_label": "712 min"
-    },
-    {
-	"pun_duration": 716,
-	"pun_id": 179,
-	"pun_label": "716 min"
-    },
-    {
-	"pun_duration": 720,
-	"pun_id": 180,
-	"pun_label": "720 min"
-    },
-    {
-	"pun_duration": 724,
-	"pun_id": 181,
-	"pun_label": "724 min"
-    },
-    {
-	"pun_duration": 728,
-	"pun_id": 182,
-	"pun_label": "728 min"
-    },
-    {
-	"pun_duration": 732,
-	"pun_id": 183,
-	"pun_label": "732 min"
-    },
-    {
-	"pun_duration": 736,
-	"pun_id": 184,
-	"pun_label": "736 min"
-    },
-    {
-	"pun_duration": 740,
-	"pun_id": 185,
-	"pun_label": "740 min"
-    },
-    {
-	"pun_duration": 744,
-	"pun_id": 186,
-	"pun_label": "744 min"
-    },
-    {
-	"pun_duration": 748,
-	"pun_id": 187,
-	"pun_label": "748 min"
-    },
-    {
-	"pun_duration": 752,
-	"pun_id": 188,
-	"pun_label": "752 min"
-    },
-    {
-	"pun_duration": 756,
-	"pun_id": 189,
-	"pun_label": "756 min"
-    },
-    {
-	"pun_duration": 760,
-	"pun_id": 190,
-	"pun_label": "760 min"
-    },
-    {
-	"pun_duration": 764,
-	"pun_id": 191,
-	"pun_label": "764 min"
-    },
-    {
-	"pun_duration": 768,
-	"pun_id": 192,
-	"pun_label": "768 min"
-    },
-    {
-	"pun_duration": 772,
-	"pun_id": 193,
-	"pun_label": "772 min"
-    },
-    {
-	"pun_duration": 776,
-	"pun_id": 194,
-	"pun_label": "776 min"
-    },
-    {
-	"pun_duration": 780,
-	"pun_id": 195,
-	"pun_label": "780 min"
-    },
-    {
-	"pun_duration": 784,
-	"pun_id": 196,
-	"pun_label": "784 min"
-    },
-    {
-	"pun_duration": 788,
-	"pun_id": 197,
-	"pun_label": "788 min"
-    },
-    {
-	"pun_duration": 792,
-	"pun_id": 198,
-	"pun_label": "792 min"
-    },
-    {
-	"pun_duration": 796,
-	"pun_id": 199,
-	"pun_label": "796 min"
-    },
-    {
-	"pun_duration": 800,
-	"pun_id": 200,
-	"pun_label": "800 min"
-    },
-    {
-	"pun_duration": 804,
-	"pun_id": 201,
-	"pun_label": "804 min"
-    },
-    {
-	"pun_duration": 808,
-	"pun_id": 202,
-	"pun_label": "808 min"
-    },
-    {
-	"pun_duration": 812,
-	"pun_id": 203,
-	"pun_label": "812 min"
-    },
-    {
-	"pun_duration": 816,
-	"pun_id": 204,
-	"pun_label": "816 min"
-    },
-    {
-	"pun_duration": 820,
-	"pun_id": 205,
-	"pun_label": "820 min"
-    },
-    {
-	"pun_duration": 824,
-	"pun_id": 206,
-	"pun_label": "824 min"
-    },
-    {
-	"pun_duration": 828,
-	"pun_id": 207,
-	"pun_label": "828 min"
-    },
-    {
-	"pun_duration": 832,
-	"pun_id": 208,
-	"pun_label": "832 min"
-    },
-    {
-	"pun_duration": 836,
-	"pun_id": 209,
-	"pun_label": "836 min"
-    },
-    {
-	"pun_duration": 840,
-	"pun_id": 210,
-	"pun_label": "840 min"
+      "pun_id": 60,
+      "pun_duration": 9240
     }
   ],
   "WeekDaysWorktime": [
@@ -2352,67 +807,59 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 1,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     },
     {
       "pwd_id": 622,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 2,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     },
     {
       "pwd_id": 623,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 3,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     },
     {
       "pwd_id": 624,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 4,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     },
     {
       "pwd_id": 625,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 5,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     },
     {
       "pwd_id": 626,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 6,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     },
     {
-      "pwd_id": 627,
+      "pwd_id": 626,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 7,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
+      "pwd_time_to": "18:00:00"
     }
   ],
   "PeriodYear": [
     {
       "pye_id": 1,
-      "pye_label": "May - September",
-      "pye_start_month": 5,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
       "pye_start_day": 1,
-      "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
+      "pye_end_month": 12,
+      "pye_end_day": 31
     }
   ]
 }

From 295dc4badc98b1d3c6abe74740e4d55314678813 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 1 Oct 2024 14:21:04 +0200
Subject: [PATCH 13/16] tariff-files for winter-term

---
 etc/psa_tariff/tariff01.json |  700 +++++----
 etc/psa_tariff/tariff02.json |  767 ++++++----
 etc/psa_tariff/tariff03.json | 2598 ++++++++++++++++++++++++++++------
 etc/psa_tariff/tariff04.json |  695 +++++----
 4 files changed, 3635 insertions(+), 1125 deletions(-)

diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index b61ea58..cf59ed4 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "Red Zone",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Info"    : "Red Zone (center)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -27,18 +27,23 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "20:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "20:00:00"
     },
     {
       "time_range_id": 3,
@@ -46,171 +51,11 @@
       "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,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
+      "pop_payment_method_id": 5,
       "pop_min_time": 12,
       "comment_pop_min_time": "12mins -> 30 cent",
       "pop_max_time": 840,
@@ -223,13 +68,7 @@
       "pop_time_step_config_comment": "STATIC",
       "pop_allow_overpay": false,
       "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,
-      "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
+      "pop_business_hours": 0
     }
   ],
   "PaymentRate": [
@@ -2346,73 +2185,452 @@
 	"pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 627,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 7,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 1,
-      "pye_label": "May - September",
-      "pye_start_month": 5,
-      "pye_start_day": 1,
-      "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
-    }
-  ]
+    "Monday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
 }
diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index 6e3b5ba..d0176b6 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "Yellow Zone",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Info"    : "Yellow Zone (plus)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -27,18 +27,23 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "18:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "18:00:00"
     },
     {
       "time_range_id": 3,
@@ -49,187 +54,21 @@
   "PaymentOption": [
     {
       "pop_id": 1049,
-      "pop_label": "Zone 2",
-      "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 5,
       "pop_min_time": 30,
-      "comment_pop_min_time": "30mins -> 30 cent",
+      "comment_pop_min_time": "12mins -> 30 cent",
       "pop_max_time": 840,
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
       "pop_max_price": 840,
-      "pop_plus_steps": 6,
+      "pop_plus_steps": 10,
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
       "pop_allow_overpay": false,
       "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,
-      "pop_business_hours": 163584,
-      "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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
+      "pop_business_hours": 0
     }
   ],
   "PaymentRate": [
@@ -656,14 +495,44 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 84,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
         "pra_price": 840
     }
   ],
   "Duration": [
     {
-	     "pun_duration": 0,
-	     "pun_id": 0,
-	     "pun_label": "0 min"
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
     },
     {
         "pun_duration": 10,
@@ -1081,78 +950,480 @@
         "pun_label": "830 min"
     },
     {
-        "pun_duration": 840,
+        "pun_duration": 830,
         "pun_id": 84,
         "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 85,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 86,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 87,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 88,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 89,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 840,
+        "pun_id": 90,
+        "pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 7,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 1,
-      "pye_label": "May - September",
-      "pye_start_month": 5,
-      "pye_start_day": 1,
-      "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
-    }
-  ]
+    "Monday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "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" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "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" : {
+            "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" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "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" : [
+	    ]
+        }
+    }]
 }
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
index 950209a..cfd8afe 100644
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,12 +1,7 @@
 {
-  "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.1+2024-09-10T16:15:20",
-  "Info"    :   "Langzeitparktarif",
-  "comment_1": 	"20mins free (broetchentaste)",
-  "comment_2": 	"every following 20mins: 0,40 euro",
-  "comment_3": 	"24h-ticket: 5,00 euro",
-  "comment_4":  "3x 24h ticket: 12,50 euro",
-  "comment_5":  "7x 24h ticket: 25,00 euro",
+  "Project" : "Kleipeda",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Info"    : "Red Zone (1 machine)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -32,205 +27,48 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "18:00:00",
+      "time_range_from": "20:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "18:00:00"
+      "time_range_to": "20:00:00"
     },
     {
       "time_range_id": 3,
-      "time_range_from": "08:00:00",
-      "time_range_to": "18:00:00"
-    },
-    {
-      "time_range_id": 4,
       "time_range_from": "00:00:00",
       "time_range_to": "08:00:00"
-    },
-    {
-      "time_range_id": 5,
-      "time_range_from": "18:00:00",
-      "time_range_to": "23:59:00"
-    }
-  ],
-  "Prepaid": [
-    {
-        "prepaid_id": 4,
-        "prepaid_anytime": true,
-        "prepaid_never": false
-    },
-    {
-        "prepaid_id": 5,
-        "prepaid_anytime": false,
-        "prepaid_never": true
-    },
-    {
-        "prepaid_id": 3,
-        "prepaid_anytime": false,
-        "prepaid_never": false,
-        "prepaid_static_start": "18:00:00",
-        "prepaid_static_end": "08:00:00"
-    },
-    {
-        "prepaid_id" : 1,
-        "prepaid_week" : [
-            {
-                "prepaid_day" : 1,
-                "prepaid_day_comment" : "Monday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18:00:00",
-                "prepaid_static_end": "08:00:00"
-            },
-            {
-                "prepaid_day" : 2,
-                "prepaid_day_comment" : "Tuesday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18:00:00",
-                "prepaid_static_end": "08:00:00"
-            },
-            {
-                "prepaid_day" : 3,
-                "prepaid_day_comment" : "Wednesday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18:00:00",
-                "prepaid_static_end": "08:00:00"
-            },
-            {
-                "prepaid_day" : 4,
-                "prepaid_day_comment" : "Thursday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18:00:00",
-                "prepaid_static_end": "08:00:00"
-            },
-            {
-                "prepaid_day" : 5,
-                "prepaid_day_comment" : "Friday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18:00:00",
-                "prepaid_static_end": "08:00:00"
-            },
-            {
-                "prepaid_day" : 6,
-                "prepaid_day_comment" : "Saturday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18:00:00",
-                "prepaid_static_end": "08:00:00"
-            },
-            {
-                "prepaid_day" : 7,
-                "prepaid_day_comment" : "Sunday",
-                "prepaid_duration": 840,
-                "prepaid_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
     }
   ],
   "PaymentOption": [
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
-      "pop_min_time": 20,
-      "pop_max_time": 10080,
-      "pop_max_price": 2500,
-      "pop_plus_steps": 4,
+      "pop_payment_method_id": 5,
+      "pop_min_time": 12,
+      "comment_pop_min_time": "12mins -> 30 cent",
+      "pop_max_time": 840,
+      "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_min_price": 0,
       "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
       "pop_carry_over": 1,
-      "pop_carry_over_option_id": 1,
-      "pop_apply_carry_over_to_ticket_endtime" : true,
-      "pop_apply_carry_over_to_ticket_endtime_comment_1" : "if end-time touches carry-over-time-range",
-      "pop_apply_carry_over_to_ticket_endtime_comment_2" : "add carry-over-time-range to end-time",
-      "pop_prepaid_option_id" : 3,
-      "pop_carry_over_time_range": 1,
-      "pop_carry_over_start_time_range": 2,
-      "pop_carry_over_end_time_range": 3,
-      "pop_daily_card_price": 500,
-      "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours"
+      "pop_business_hours": 0
     }
   ],
   "PaymentRate": [
@@ -487,379 +325,2351 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 50,
-        "pra_price": 500,
-        "pra_comment": "24h-ticket"
+        "pra_price": 500
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 51,
-        "pra_price": 500,
-        "pra_comment": "24h-ticket"
+        "pra_price": 510
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 52,
-        "pra_price": 500,
-        "pra_comment": "24h-ticket"
+        "pra_price": 520
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 53,
-        "pra_price": 0,
-        "pra_comment": "dummy"
+        "pra_price": 530
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 54,
-        "pra_price": 0,
-        "pra_comment": "dummy"
+        "pra_price": 540
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 55,
-        "pra_price": 0,
-        "pra_comment": "dummy"
+        "pra_price": 550
     },
     {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 56,
-      "pra_price": 1250,
-      "pra_comment": "3x24h-ticket"
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 56,
+        "pra_price": 560
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 57,
-        "pra_price": 0,
-        "pra_comment": "dummy"
+        "pra_price": 570
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 58,
-        "pra_price": 0,
-        "pra_comment": "dummy"
+        "pra_price": 580
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 59,
-        "pra_price": 0,
-        "pra_comment": "dummy"
+        "pra_price": 590
     },
     {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 60,
-      "pra_price": 2500,
-      "pra_comment": "7x24h-ticket"
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 60,
+        "pra_price": 600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 61,
+        "pra_price": 610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 62,
+        "pra_price": 620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 63,
+        "pra_price": 630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 64,
+        "pra_price": 640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 65,
+        "pra_price": 650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 66,
+        "pra_price": 660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 67,
+        "pra_price": 670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 68,
+        "pra_price": 680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 69,
+        "pra_price": 690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 70,
+        "pra_price": 700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 71,
+        "pra_price": 710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 72,
+        "pra_price": 720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 73,
+        "pra_price": 730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 74,
+        "pra_price": 740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 75,
+        "pra_price": 750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 76,
+        "pra_price": 760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 77,
+        "pra_price": 770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 78,
+        "pra_price": 780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 79,
+        "pra_price": 790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 80,
+        "pra_price": 800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 81,
+        "pra_price": 810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 82,
+        "pra_price": 820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 83,
+        "pra_price": 830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 84,
+        "pra_price": 840
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 850
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 860
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 870
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 880
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 890
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
+        "pra_price": 900
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 91,
+        "pra_price": 910
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 92,
+        "pra_price": 920
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 93,
+        "pra_price": 930
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 94,
+        "pra_price": 940
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 95,
+        "pra_price": 950
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 96,
+        "pra_price": 960
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 97,
+        "pra_price": 970
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 98,
+        "pra_price": 980
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 99,
+        "pra_price": 990
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 100,
+        "pra_price": 1000
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 101,
+        "pra_price": 1010
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 102,
+        "pra_price": 1020
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 103,
+        "pra_price": 1030
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 104,
+        "pra_price": 1040
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 105,
+        "pra_price": 1050
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 106,
+        "pra_price": 1060
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 107,
+        "pra_price": 1070
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 108,
+        "pra_price": 1080
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 109,
+        "pra_price": 1090
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 110,
+        "pra_price": 1100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 111,
+        "pra_price": 1110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 112,
+        "pra_price": 1120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 113,
+        "pra_price": 1130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 114,
+        "pra_price": 1140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 115,
+        "pra_price": 1150
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 116,
+        "pra_price": 1160
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 117,
+        "pra_price": 1170
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 118,
+        "pra_price": 1180
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 119,
+        "pra_price": 1190
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 120,
+        "pra_price": 1200
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 121,
+        "pra_price": 1210
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 122,
+        "pra_price": 1220
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 123,
+        "pra_price": 1230
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 124,
+        "pra_price": 1240
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 125,
+        "pra_price": 1250
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 126,
+        "pra_price": 1260
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 127,
+        "pra_price": 1270
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 128,
+        "pra_price": 1280
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 129,
+        "pra_price": 1290
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 130,
+        "pra_price": 1300
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 131,
+        "pra_price": 1310
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 132,
+        "pra_price": 1320
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 133,
+        "pra_price": 1330
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 134,
+        "pra_price": 1340
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 135,
+        "pra_price": 1350
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 136,
+        "pra_price": 1360
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 137,
+        "pra_price": 1370
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 138,
+        "pra_price": 1380
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 139,
+        "pra_price": 1390
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 140,
+        "pra_price": 1400
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 141,
+        "pra_price": 1410
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 142,
+        "pra_price": 1420
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 143,
+        "pra_price": 1430
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 144,
+        "pra_price": 1440
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 145,
+        "pra_price": 1450
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 146,
+        "pra_price": 1460
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 147,
+        "pra_price": 1470
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 148,
+        "pra_price": 1480
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 149,
+        "pra_price": 1490
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 150,
+        "pra_price": 1500
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 151,
+        "pra_price": 1510
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 152,
+        "pra_price": 1520
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 153,
+        "pra_price": 1530
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 154,
+        "pra_price": 1540
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 155,
+        "pra_price": 1550
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 156,
+        "pra_price": 1560
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 157,
+        "pra_price": 1570
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 158,
+        "pra_price": 1580
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 159,
+        "pra_price": 1590
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 160,
+        "pra_price": 1600
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 161,
+        "pra_price": 1610
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 162,
+        "pra_price": 1620
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 163,
+        "pra_price": 1630
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 164,
+        "pra_price": 1640
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 165,
+        "pra_price": 1650
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 166,
+        "pra_price": 1660
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 167,
+        "pra_price": 1670
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 168,
+        "pra_price": 1680
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 169,
+        "pra_price": 1690
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 170,
+        "pra_price": 1700
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 171,
+        "pra_price": 1710
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 172,
+        "pra_price": 1720
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 173,
+        "pra_price": 1730
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 174,
+        "pra_price": 1740
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 175,
+        "pra_price": 1750
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 176,
+        "pra_price": 1760
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 177,
+        "pra_price": 1770
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 178,
+        "pra_price": 1780
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 179,
+        "pra_price": 1790
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 180,
+        "pra_price": 1800
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 181,
+        "pra_price": 1810
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 182,
+        "pra_price": 1820
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 183,
+        "pra_price": 1830
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 184,
+        "pra_price": 1840
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 185,
+        "pra_price": 1850
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 186,
+        "pra_price": 1860
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 187,
+        "pra_price": 1870
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 188,
+        "pra_price": 1880
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 189,
+        "pra_price": 1890
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 190,
+        "pra_price": 1900
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 191,
+        "pra_price": 1910
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 192,
+        "pra_price": 1920
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 193,
+        "pra_price": 1930
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 194,
+        "pra_price": 1940
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 195,
+        "pra_price": 1950
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 196,
+        "pra_price": 1960
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 197,
+        "pra_price": 1970
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 198,
+        "pra_price": 1980
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 199,
+        "pra_price": 1990
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 200,
+        "pra_price": 2000
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 201,
+        "pra_price": 2010
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 202,
+        "pra_price": 2020
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 203,
+        "pra_price": 2030
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 204,
+        "pra_price": 2040
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 205,
+        "pra_price": 2050
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 206,
+        "pra_price": 2060
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 207,
+        "pra_price": 2070
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 208,
+        "pra_price": 2080
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 209,
+        "pra_price": 2090
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 210,
+        "pra_price": 2100
     }
   ],
   "Duration": [
     {
-      "pun_id": 0,
-      "pun_duration": 20
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
     },
     {
-      "pun_id": 1,
-      "pun_duration": 25
+	"pun_duration": 4,
+	"pun_id": 1,
+	"pun_label": "4 min"
     },
     {
-      "pun_id": 2,
-      "pun_duration": 30
+	"pun_duration": 8,
+	"pun_id": 2,
+	"pun_label": "8 min"
     },
     {
-      "pun_id": 3,
-      "pun_duration": 35
+	"pun_duration": 12,
+	"pun_id": 3,
+	"pun_label": "12 min"
     },
     {
-      "pun_id": 4,
-      "pun_duration": 40
+	"pun_duration": 16,
+	"pun_id": 4,
+	"pun_label": "16 min"
     },
     {
-      "pun_id": 5,
-      "pun_duration": 45
+	"pun_duration": 20,
+	"pun_id": 5,
+	"pun_label": "20 min"
     },
     {
-      "pun_id": 6,
-      "pun_duration": 50
+	"pun_duration": 24,
+	"pun_id": 6,
+	"pun_label": "24 min"
     },
     {
-      "pun_id": 7,
-      "pun_duration": 55
+	"pun_duration": 28,
+	"pun_id": 7,
+	"pun_label": "28 min"
     },
     {
-      "pun_id": 8,
-      "pun_duration": 60
+	"pun_duration": 32,
+	"pun_id": 8,
+	"pun_label": "32 min"
     },
     {
-      "pun_id": 9,
-      "pun_duration": 65
+	"pun_duration": 36,
+	"pun_id": 9,
+	"pun_label": "36 min"
     },
     {
-      "pun_id": 10,
-      "pun_duration": 70
+	"pun_duration": 40,
+	"pun_id": 10,
+	"pun_label": "40 min"
     },
     {
-      "pun_id": 11,
-      "pun_duration": 75
+	"pun_duration": 44,
+	"pun_id": 11,
+	"pun_label": "44 min"
     },
     {
-      "pun_id": 12,
-      "pun_duration": 80
+	"pun_duration": 48,
+	"pun_id": 12,
+	"pun_label": "48 min"
     },
     {
-      "pun_id": 13,
-      "pun_duration": 85
+	"pun_duration": 52,
+	"pun_id": 13,
+	"pun_label": "52 min"
     },
     {
-      "pun_id": 14,
-      "pun_duration": 90
+	"pun_duration": 56,
+	"pun_id": 14,
+	"pun_label": "56 min"
     },
     {
-      "pun_id": 15,
-      "pun_duration": 95
+	"pun_duration": 60,
+	"pun_id": 15,
+	"pun_label": "60 min"
     },
     {
-      "pun_id": 16,
-      "pun_duration": 100
+	"pun_duration": 64,
+	"pun_id": 16,
+	"pun_label": "64 min"
     },
     {
-      "pun_id": 17,
-      "pun_duration": 105
+	"pun_duration": 68,
+	"pun_id": 17,
+	"pun_label": "68 min"
     },
     {
-      "pun_id": 18,
-      "pun_duration": 110
+	"pun_duration": 72,
+	"pun_id": 18,
+	"pun_label": "72 min"
     },
     {
-      "pun_id": 19,
-      "pun_duration": 115
+	"pun_duration": 76,
+	"pun_id": 19,
+	"pun_label": "76 min"
     },
     {
-      "pun_id": 20,
-      "pun_duration": 120
+	"pun_duration": 80,
+	"pun_id": 20,
+	"pun_label": "80 min"
     },
     {
-      "pun_id": 21,
-      "pun_duration": 125
+	"pun_duration": 84,
+	"pun_id": 21,
+	"pun_label": "84 min"
     },
     {
-      "pun_id": 22,
-      "pun_duration": 130
+	"pun_duration": 88,
+	"pun_id": 22,
+	"pun_label": "88 min"
     },
     {
-      "pun_id": 23,
-      "pun_duration": 135
+	"pun_duration": 92,
+	"pun_id": 23,
+	"pun_label": "92 min"
     },
     {
-      "pun_id": 24,
-      "pun_duration": 140
+	"pun_duration": 96,
+	"pun_id": 24,
+	"pun_label": "96 min"
     },
     {
-      "pun_id": 25,
-      "pun_duration": 145
+	"pun_duration": 100,
+	"pun_id": 25,
+	"pun_label": "100 min"
     },
     {
-      "pun_id": 26,
-      "pun_duration": 150
+	"pun_duration": 104,
+	"pun_id": 26,
+	"pun_label": "104 min"
     },
     {
-      "pun_id": 27,
-      "pun_duration": 155
+	"pun_duration": 108,
+	"pun_id": 27,
+	"pun_label": "108 min"
     },
     {
-      "pun_id": 28,
-      "pun_duration": 160
+	"pun_duration": 112,
+	"pun_id": 28,
+	"pun_label": "112 min"
     },
     {
-      "pun_id": 29,
-      "pun_duration": 165
+	"pun_duration": 116,
+	"pun_id": 29,
+	"pun_label": "116 min"
     },
     {
-      "pun_id": 30,
-      "pun_duration": 170
+	"pun_duration": 120,
+	"pun_id": 30,
+	"pun_label": "120 min"
     },
     {
-      "pun_id": 31,
-      "pun_duration": 175
+	"pun_duration": 124,
+	"pun_id": 31,
+	"pun_label": "124 min"
     },
     {
-      "pun_id": 32,
-      "pun_duration": 180
+	"pun_duration": 128,
+	"pun_id": 32,
+	"pun_label": "128 min"
     },
     {
-      "pun_id": 33,
-      "pun_duration": 185
+	"pun_duration": 132,
+	"pun_id": 33,
+	"pun_label": "132 min"
     },
     {
-      "pun_id": 34,
-      "pun_duration": 190
+	"pun_duration": 136,
+	"pun_id": 34,
+	"pun_label": "136 min"
     },
     {
-      "pun_id": 35,
-      "pun_duration": 195
+	"pun_duration": 140,
+	"pun_id": 35,
+	"pun_label": "140 min"
     },
     {
-      "pun_id": 36,
-      "pun_duration": 200
+	"pun_duration": 144,
+	"pun_id": 36,
+	"pun_label": "144 min"
     },
     {
-      "pun_id": 37,
-      "pun_duration": 205
+	"pun_duration": 148,
+	"pun_id": 37,
+	"pun_label": "148 min"
     },
     {
-      "pun_id": 38,
-      "pun_duration": 210
+	"pun_duration": 152,
+	"pun_id": 38,
+	"pun_label": "152 min"
     },
     {
-      "pun_id": 39,
-      "pun_duration": 215
+	"pun_duration": 156,
+	"pun_id": 39,
+	"pun_label": "156 min"
     },
     {
-      "pun_id": 40,
-      "pun_duration": 220
+	"pun_duration": 160,
+	"pun_id": 40,
+	"pun_label": "160 min"
     },
     {
-      "pun_id": 41,
-      "pun_duration": 225
+	"pun_duration": 164,
+	"pun_id": 41,
+	"pun_label": "164 min"
     },
     {
-      "pun_id": 42,
-      "pun_duration": 230
+	"pun_duration": 168,
+	"pun_id": 42,
+	"pun_label": "168 min"
     },
     {
-      "pun_id": 43,
-      "pun_duration": 235
+	"pun_duration": 172,
+	"pun_id": 43,
+	"pun_label": "172 min"
     },
     {
-      "pun_id": 44,
-      "pun_duration": 240
+	"pun_duration": 176,
+	"pun_id": 44,
+	"pun_label": "176 min"
     },
     {
-      "pun_id": 45,
-      "pun_duration": 245
+	"pun_duration": 180,
+	"pun_id": 45,
+	"pun_label": "180 min"
     },
     {
-      "pun_id": 46,
-      "pun_duration": 250
+	"pun_duration": 184,
+	"pun_id": 46,
+	"pun_label": "184 min"
     },
     {
-      "pun_id": 47,
-      "pun_duration": 255
+	"pun_duration": 188,
+	"pun_id": 47,
+	"pun_label": "188 min"
     },
     {
-      "pun_id": 48,
-      "pun_duration": 260
+	"pun_duration": 192,
+	"pun_id": 48,
+	"pun_label": "192 min"
     },
     {
-      "pun_id": 49,
-      "pun_duration": 265
+	"pun_duration": 196,
+	"pun_id": 49,
+	"pun_label": "196 min"
     },
     {
-      "pun_id": 50,
-      "pun_duration": 265
+	"pun_duration": 200,
+	"pun_id": 50,
+	"pun_label": "200 min"
     },
     {
-      "pun_id": 51,
-      "pun_duration": 265
+	"pun_duration": 204,
+	"pun_id": 51,
+	"pun_label": "204 min"
     },
     {
-      "pun_id": 52,
-      "pun_duration": 600
+	"pun_duration": 208,
+	"pun_id": 52,
+	"pun_label": "208 min"
     },
     {
-      "pun_id": 53,
-      "pun_duration": 600
+	"pun_duration": 212,
+	"pun_id": 53,
+	"pun_label": "212 min"
     },
     {
-      "pun_id": 54,
-      "pun_duration": 600
+	"pun_duration": 216,
+	"pun_id": 54,
+	"pun_label": "216 min"
     },
     {
-      "pun_id": 54,
-      "pun_duration": 600
+	"pun_duration": 220,
+	"pun_id": 55,
+	"pun_label": "220 min"
     },
     {
-      "pun_id": 55,
-      "pun_duration": 600
+	"pun_duration": 224,
+	"pun_id": 56,
+	"pun_label": "224 min"
     },
     {
-      "pun_id": 56,
-      "pun_duration": 3480
+	"pun_duration": 228,
+	"pun_id": 57,
+	"pun_label": "228 min"
     },
     {
-      "pun_id": 57,
-      "pun_duration": 3480
+	"pun_duration": 232,
+	"pun_id": 58,
+	"pun_label": "232 min"
     },
     {
-      "pun_id": 58,
-      "pun_duration": 3480
+	"pun_duration": 236,
+	"pun_id": 59,
+	"pun_label": "236 min"
     },
     {
-      "pun_id": 59,
-      "pun_duration": 3480
+	"pun_duration": 240,
+	"pun_id": 60,
+	"pun_label": "240 min"
     },
     {
-      "pun_id": 60,
-      "pun_duration": 9240
+	"pun_duration": 244,
+	"pun_id": 61,
+	"pun_label": "244 min"
+    },
+    {
+	"pun_duration": 248,
+	"pun_id": 62,
+	"pun_label": "248 min"
+    },
+    {
+	"pun_duration": 252,
+	"pun_id": 63,
+	"pun_label": "252 min"
+    },
+    {
+	"pun_duration": 256,
+	"pun_id": 64,
+	"pun_label": "256 min"
+    },
+    {
+	"pun_duration": 260,
+	"pun_id": 65,
+	"pun_label": "260 min"
+    },
+    {
+	"pun_duration": 264,
+	"pun_id": 66,
+	"pun_label": "264 min"
+    },
+    {
+	"pun_duration": 268,
+	"pun_id": 67,
+	"pun_label": "268 min"
+    },
+    {
+	"pun_duration": 272,
+	"pun_id": 68,
+	"pun_label": "272 min"
+    },
+    {
+	"pun_duration": 276,
+	"pun_id": 69,
+	"pun_label": "276 min"
+    },
+    {
+	"pun_duration": 280,
+	"pun_id": 70,
+	"pun_label": "280 min"
+    },
+    {
+	"pun_duration": 284,
+	"pun_id": 71,
+	"pun_label": "284 min"
+    },
+    {
+	"pun_duration": 288,
+	"pun_id": 72,
+	"pun_label": "288 min"
+    },
+    {
+	"pun_duration": 292,
+	"pun_id": 73,
+	"pun_label": "292 min"
+    },
+    {
+	"pun_duration": 296,
+	"pun_id": 74,
+	"pun_label": "296 min"
+    },
+    {
+	"pun_duration": 300,
+	"pun_id": 75,
+	"pun_label": "300 min"
+    },
+    {
+	"pun_duration": 304,
+	"pun_id": 76,
+	"pun_label": "304 min"
+    },
+    {
+	"pun_duration": 308,
+	"pun_id": 77,
+	"pun_label": "308 min"
+    },
+    {
+	"pun_duration": 312,
+	"pun_id": 78,
+	"pun_label": "312 min"
+    },
+    {
+	"pun_duration": 316,
+	"pun_id": 79,
+	"pun_label": "316 min"
+    },
+    {
+	"pun_duration": 320,
+	"pun_id": 80,
+	"pun_label": "320 min"
+    },
+    {
+	"pun_duration": 324,
+	"pun_id": 81,
+	"pun_label": "324 min"
+    },
+    {
+	"pun_duration": 328,
+	"pun_id": 82,
+	"pun_label": "328 min"
+    },
+    {
+	"pun_duration": 332,
+	"pun_id": 83,
+	"pun_label": "332 min"
+    },
+    {
+	"pun_duration": 336,
+	"pun_id": 84,
+	"pun_label": "336 min"
+    },
+    {
+	"pun_duration": 340,
+	"pun_id": 85,
+	"pun_label": "340 min"
+    },
+    {
+	"pun_duration": 344,
+	"pun_id": 86,
+	"pun_label": "344 min"
+    },
+    {
+	"pun_duration": 348,
+	"pun_id": 87,
+	"pun_label": "348 min"
+    },
+    {
+	"pun_duration": 352,
+	"pun_id": 88,
+	"pun_label": "352 min"
+    },
+    {
+	"pun_duration": 356,
+	"pun_id": 89,
+	"pun_label": "356 min"
+    },
+    {
+	"pun_duration": 360,
+	"pun_id": 90,
+	"pun_label": "360 min"
+    },
+    {
+	"pun_duration": 364,
+	"pun_id": 91,
+	"pun_label": "364 min"
+    },
+    {
+	"pun_duration": 368,
+	"pun_id": 92,
+	"pun_label": "368 min"
+    },
+    {
+	"pun_duration": 372,
+	"pun_id": 93,
+	"pun_label": "372 min"
+    },
+    {
+	"pun_duration": 376,
+	"pun_id": 94,
+	"pun_label": "376 min"
+    },
+    {
+	"pun_duration": 380,
+	"pun_id": 95,
+	"pun_label": "380 min"
+    },
+    {
+	"pun_duration": 384,
+	"pun_id": 96,
+	"pun_label": "384 min"
+    },
+    {
+	"pun_duration": 388,
+	"pun_id": 97,
+	"pun_label": "388 min"
+    },
+    {
+	"pun_duration": 392,
+	"pun_id": 98,
+	"pun_label": "392 min"
+    },
+    {
+	"pun_duration": 396,
+	"pun_id": 99,
+	"pun_label": "396 min"
+    },
+    {
+	"pun_duration": 400,
+	"pun_id": 100,
+	"pun_label": "400 min"
+    },
+    {
+	"pun_duration": 404,
+	"pun_id": 101,
+	"pun_label": "404 min"
+    },
+    {
+	"pun_duration": 408,
+	"pun_id": 102,
+	"pun_label": "408 min"
+    },
+    {
+	"pun_duration": 412,
+	"pun_id": 103,
+	"pun_label": "412 min"
+    },
+    {
+	"pun_duration": 416,
+	"pun_id": 104,
+	"pun_label": "416 min"
+    },
+    {
+	"pun_duration": 420,
+	"pun_id": 105,
+	"pun_label": "420 min"
+    },
+    {
+	"pun_duration": 424,
+	"pun_id": 106,
+	"pun_label": "424 min"
+    },
+    {
+	"pun_duration": 428,
+	"pun_id": 107,
+	"pun_label": "428 min"
+    },
+    {
+	"pun_duration": 432,
+	"pun_id": 108,
+	"pun_label": "432 min"
+    },
+    {
+	"pun_duration": 436,
+	"pun_id": 109,
+	"pun_label": "436 min"
+    },
+    {
+	"pun_duration": 440,
+	"pun_id": 110,
+	"pun_label": "440 min"
+    },
+    {
+	"pun_duration": 444,
+	"pun_id": 111,
+	"pun_label": "444 min"
+    },
+    {
+	"pun_duration": 448,
+	"pun_id": 112,
+	"pun_label": "448 min"
+    },
+    {
+	"pun_duration": 452,
+	"pun_id": 113,
+	"pun_label": "452 min"
+    },
+    {
+	"pun_duration": 456,
+	"pun_id": 114,
+	"pun_label": "456 min"
+    },
+    {
+	"pun_duration": 460,
+	"pun_id": 115,
+	"pun_label": "460 min"
+    },
+    {
+	"pun_duration": 464,
+	"pun_id": 116,
+	"pun_label": "464 min"
+    },
+    {
+	"pun_duration": 468,
+	"pun_id": 117,
+	"pun_label": "468 min"
+    },
+    {
+	"pun_duration": 472,
+	"pun_id": 118,
+	"pun_label": "472 min"
+    },
+    {
+	"pun_duration": 476,
+	"pun_id": 119,
+	"pun_label": "476 min"
+    },
+    {
+	"pun_duration": 480,
+	"pun_id": 120,
+	"pun_label": "480 min"
+    },
+    {
+	"pun_duration": 484,
+	"pun_id": 121,
+	"pun_label": "484 min"
+    },
+    {
+	"pun_duration": 488,
+	"pun_id": 122,
+	"pun_label": "488 min"
+    },
+    {
+	"pun_duration": 492,
+	"pun_id": 123,
+	"pun_label": "492 min"
+    },
+    {
+	"pun_duration": 496,
+	"pun_id": 124,
+	"pun_label": "496 min"
+    },
+    {
+	"pun_duration": 500,
+	"pun_id": 125,
+	"pun_label": "500 min"
+    },
+    {
+	"pun_duration": 504,
+	"pun_id": 126,
+	"pun_label": "504 min"
+    },
+    {
+	"pun_duration": 508,
+	"pun_id": 127,
+	"pun_label": "508 min"
+    },
+    {
+	"pun_duration": 512,
+	"pun_id": 128,
+	"pun_label": "512 min"
+    },
+    {
+	"pun_duration": 516,
+	"pun_id": 129,
+	"pun_label": "516 min"
+    },
+    {
+	"pun_duration": 520,
+	"pun_id": 130,
+	"pun_label": "520 min"
+    },
+    {
+	"pun_duration": 524,
+	"pun_id": 131,
+	"pun_label": "524 min"
+    },
+    {
+	"pun_duration": 528,
+	"pun_id": 132,
+	"pun_label": "528 min"
+    },
+    {
+	"pun_duration": 532,
+	"pun_id": 133,
+	"pun_label": "532 min"
+    },
+    {
+	"pun_duration": 536,
+	"pun_id": 134,
+	"pun_label": "536 min"
+    },
+    {
+	"pun_duration": 540,
+	"pun_id": 135,
+	"pun_label": "540 min"
+    },
+    {
+	"pun_duration": 544,
+	"pun_id": 136,
+	"pun_label": "544 min"
+    },
+    {
+	"pun_duration": 548,
+	"pun_id": 137,
+	"pun_label": "548 min"
+    },
+    {
+	"pun_duration": 552,
+	"pun_id": 138,
+	"pun_label": "552 min"
+    },
+    {
+	"pun_duration": 556,
+	"pun_id": 139,
+	"pun_label": "556 min"
+    },
+    {
+	"pun_duration": 560,
+	"pun_id": 140,
+	"pun_label": "560 min"
+    },
+    {
+	"pun_duration": 564,
+	"pun_id": 141,
+	"pun_label": "564 min"
+    },
+    {
+	"pun_duration": 568,
+	"pun_id": 142,
+	"pun_label": "568 min"
+    },
+    {
+	"pun_duration": 572,
+	"pun_id": 143,
+	"pun_label": "572 min"
+    },
+    {
+	"pun_duration": 576,
+	"pun_id": 144,
+	"pun_label": "576 min"
+    },
+    {
+	"pun_duration": 580,
+	"pun_id": 145,
+	"pun_label": "580 min"
+    },
+    {
+	"pun_duration": 584,
+	"pun_id": 146,
+	"pun_label": "584 min"
+    },
+    {
+	"pun_duration": 588,
+	"pun_id": 147,
+	"pun_label": "588 min"
+    },
+    {
+	"pun_duration": 592,
+	"pun_id": 148,
+	"pun_label": "592 min"
+    },
+    {
+	"pun_duration": 596,
+	"pun_id": 149,
+	"pun_label": "596 min"
+    },
+    {
+	"pun_duration": 600,
+	"pun_id": 150,
+	"pun_label": "600 min"
+    },
+    {
+	"pun_duration": 604,
+	"pun_id": 151,
+	"pun_label": "604 min"
+    },
+    {
+	"pun_duration": 608,
+	"pun_id": 152,
+	"pun_label": "608 min"
+    },
+    {
+	"pun_duration": 612,
+	"pun_id": 153,
+	"pun_label": "612 min"
+    },
+    {
+	"pun_duration": 616,
+	"pun_id": 154,
+	"pun_label": "616 min"
+    },
+    {
+	"pun_duration": 620,
+	"pun_id": 155,
+	"pun_label": "620 min"
+    },
+    {
+	"pun_duration": 624,
+	"pun_id": 156,
+	"pun_label": "624 min"
+    },
+    {
+	"pun_duration": 628,
+	"pun_id": 157,
+	"pun_label": "628 min"
+    },
+    {
+	"pun_duration": 632,
+	"pun_id": 158,
+	"pun_label": "632 min"
+    },
+    {
+	"pun_duration": 636,
+	"pun_id": 159,
+	"pun_label": "636 min"
+    },
+    {
+	"pun_duration": 640,
+	"pun_id": 160,
+	"pun_label": "640 min"
+    },
+    {
+	"pun_duration": 644,
+	"pun_id": 161,
+	"pun_label": "644 min"
+    },
+    {
+	"pun_duration": 648,
+	"pun_id": 162,
+	"pun_label": "648 min"
+    },
+    {
+	"pun_duration": 652,
+	"pun_id": 163,
+	"pun_label": "652 min"
+    },
+    {
+	"pun_duration": 656,
+	"pun_id": 164,
+	"pun_label": "656 min"
+    },
+    {
+	"pun_duration": 660,
+	"pun_id": 165,
+	"pun_label": "660 min"
+    },
+    {
+	"pun_duration": 664,
+	"pun_id": 166,
+	"pun_label": "664 min"
+    },
+    {
+	"pun_duration": 668,
+	"pun_id": 167,
+	"pun_label": "668 min"
+    },
+    {
+	"pun_duration": 672,
+	"pun_id": 168,
+	"pun_label": "672 min"
+    },
+    {
+	"pun_duration": 676,
+	"pun_id": 169,
+	"pun_label": "676 min"
+    },
+    {
+	"pun_duration": 680,
+	"pun_id": 170,
+	"pun_label": "680 min"
+    },
+    {
+	"pun_duration": 684,
+	"pun_id": 171,
+	"pun_label": "684 min"
+    },
+    {
+	"pun_duration": 688,
+	"pun_id": 172,
+	"pun_label": "688 min"
+    },
+    {
+	"pun_duration": 692,
+	"pun_id": 173,
+	"pun_label": "692 min"
+    },
+    {
+	"pun_duration": 696,
+	"pun_id": 174,
+	"pun_label": "696 min"
+    },
+    {
+	"pun_duration": 700,
+	"pun_id": 175,
+	"pun_label": "700 min"
+    },
+    {
+	"pun_duration": 704,
+	"pun_id": 176,
+	"pun_label": "704 min"
+    },
+    {
+	"pun_duration": 708,
+	"pun_id": 177,
+	"pun_label": "708 min"
+    },
+    {
+	"pun_duration": 712,
+	"pun_id": 178,
+	"pun_label": "712 min"
+    },
+    {
+	"pun_duration": 716,
+	"pun_id": 179,
+	"pun_label": "716 min"
+    },
+    {
+	"pun_duration": 720,
+	"pun_id": 180,
+	"pun_label": "720 min"
+    },
+    {
+	"pun_duration": 724,
+	"pun_id": 181,
+	"pun_label": "724 min"
+    },
+    {
+	"pun_duration": 728,
+	"pun_id": 182,
+	"pun_label": "728 min"
+    },
+    {
+	"pun_duration": 732,
+	"pun_id": 183,
+	"pun_label": "732 min"
+    },
+    {
+	"pun_duration": 736,
+	"pun_id": 184,
+	"pun_label": "736 min"
+    },
+    {
+	"pun_duration": 740,
+	"pun_id": 185,
+	"pun_label": "740 min"
+    },
+    {
+	"pun_duration": 744,
+	"pun_id": 186,
+	"pun_label": "744 min"
+    },
+    {
+	"pun_duration": 748,
+	"pun_id": 187,
+	"pun_label": "748 min"
+    },
+    {
+	"pun_duration": 752,
+	"pun_id": 188,
+	"pun_label": "752 min"
+    },
+    {
+	"pun_duration": 756,
+	"pun_id": 189,
+	"pun_label": "756 min"
+    },
+    {
+	"pun_duration": 760,
+	"pun_id": 190,
+	"pun_label": "760 min"
+    },
+    {
+	"pun_duration": 764,
+	"pun_id": 191,
+	"pun_label": "764 min"
+    },
+    {
+	"pun_duration": 768,
+	"pun_id": 192,
+	"pun_label": "768 min"
+    },
+    {
+	"pun_duration": 772,
+	"pun_id": 193,
+	"pun_label": "772 min"
+    },
+    {
+	"pun_duration": 776,
+	"pun_id": 194,
+	"pun_label": "776 min"
+    },
+    {
+	"pun_duration": 780,
+	"pun_id": 195,
+	"pun_label": "780 min"
+    },
+    {
+	"pun_duration": 784,
+	"pun_id": 196,
+	"pun_label": "784 min"
+    },
+    {
+	"pun_duration": 788,
+	"pun_id": 197,
+	"pun_label": "788 min"
+    },
+    {
+	"pun_duration": 792,
+	"pun_id": 198,
+	"pun_label": "792 min"
+    },
+    {
+	"pun_duration": 796,
+	"pun_id": 199,
+	"pun_label": "796 min"
+    },
+    {
+	"pun_duration": 800,
+	"pun_id": 200,
+	"pun_label": "800 min"
+    },
+    {
+	"pun_duration": 804,
+	"pun_id": 201,
+	"pun_label": "804 min"
+    },
+    {
+	"pun_duration": 808,
+	"pun_id": 202,
+	"pun_label": "808 min"
+    },
+    {
+	"pun_duration": 812,
+	"pun_id": 203,
+	"pun_label": "812 min"
+    },
+    {
+	"pun_duration": 816,
+	"pun_id": 204,
+	"pun_label": "816 min"
+    },
+    {
+	"pun_duration": 820,
+	"pun_id": 205,
+	"pun_label": "820 min"
+    },
+    {
+	"pun_duration": 824,
+	"pun_id": 206,
+	"pun_label": "824 min"
+    },
+    {
+	"pun_duration": 828,
+	"pun_id": 207,
+	"pun_label": "828 min"
+    },
+    {
+	"pun_duration": 832,
+	"pun_id": 208,
+	"pun_label": "832 min"
+    },
+    {
+	"pun_duration": 836,
+	"pun_id": 209,
+	"pun_label": "836 min"
+    },
+    {
+	"pun_duration": 840,
+	"pun_id": 210,
+	"pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 7,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 1,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    }
-  ]
+    "Monday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "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" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
 }
diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json
index 96985e1..bcf5ce8 100644
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
   "Info"    : "Yellow Zone (center)",
   "Currency": [
     {
@@ -27,18 +27,23 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "18:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "18:00:00"
     },
     {
       "time_range_id": 3,
@@ -49,13 +54,10 @@
   "PaymentOption": [
     {
       "pop_id": 1049,
-      "pop_label": "Zone 2",
-      "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 5,
       "pop_min_time": 30,
-      "comment_pop_min_time": "30mins -> 30 cent",
+      "comment_pop_min_time": "12mins -> 30 cent",
       "pop_max_time": 840,
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
@@ -66,170 +68,7 @@
       "pop_time_step_config_comment": "STATIC",
       "pop_allow_overpay": false,
       "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,
-      "pop_business_hours": 163584,
-      "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": "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18: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": 840,
-            "carry_over_static_start" : "18:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
+      "pop_business_hours": 0
     }
   ],
   "PaymentRate": [
@@ -1146,73 +985,445 @@
         "pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 7,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 1,
-      "pye_label": "May - September",
-      "pye_start_month": 5,
-      "pye_start_day": 1,
-      "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
-    }
-  ]
+    "Monday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "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" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "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" : {
+            "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" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "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" : [
+	    ]
+        }
+    }]
 }

From 8e5de08bd0b63e9d3720876030c17145262402ae Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 2 Oct 2024 15:59:02 +0200
Subject: [PATCH 14/16] Update tariff-files for winter term

---
 etc/psa_tariff/tariff01.json |   2 +-
 etc/psa_tariff/tariff02.json | 431 ++++++++++++++++++++++++++++++-
 etc/psa_tariff/tariff03.json | 487 +++++++++++++++++++++++++++++++----
 etc/psa_tariff/tariff04.json | 431 ++++++++++++++++++++++++++++++-
 4 files changed, 1296 insertions(+), 55 deletions(-)

diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index cf59ed4..27f4277 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json
index d0176b6..9aff88e 100644
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
@@ -986,6 +986,45 @@
     }
   ],
     "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" : {
             "payment_settings" : [
                 {
@@ -1050,6 +1089,84 @@
         }
     }],
     "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" : [
                 {
@@ -1114,6 +1231,84 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -1178,6 +1373,84 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -1345,6 +1618,45 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -1386,6 +1698,123 @@
         }
     }],
     "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" : {
+            "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" : [
                 {
diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json
index cfd8afe..eedc1cd 100644
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
   "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
-  "Info"    : "Red Zone (1 machine)",
+  "Info"    : "Red Zone ()",
   "Currency": [
     {
       "pcu_id": 2,
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
@@ -2186,6 +2186,45 @@
     }
   ],
     "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" : {
             "payment_settings" : [
                 {
@@ -2250,6 +2289,84 @@
         }
     }],
     "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" : [
                 {
@@ -2314,6 +2431,84 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -2378,6 +2573,84 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -2545,13 +2818,13 @@
         }
     }],
     "Saturday" : [{
-        "default" : {
+        "2024-11-02" : {
             "payment_settings" : [
                 {
-                    "min_time" : 12,
-                    "max_time" : 840,
-                    "max_price": 2100,
-                    "min_price": 30
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
                 }
             ],
             "prepaid_settings" : [
@@ -2559,14 +2832,8 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 480,
+                            "prepaid_duration": 1440,
                             "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 240,
-                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2578,44 +2845,66 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 480,
+                            "carry_over_duration": 1440,
                             "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 240,
-                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+            ],
+            "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,
-                            "service_duration": 720,
-                            "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "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" : [
 	    ]
         }
     }],
     "Sunday" : [{
-        "default" : {
+        "2025-02-16" : {
             "payment_settings" : [
                 {
-                    "min_time" : 12,
-                    "max_time" : 840,
-                    "max_price": 2100,
-                    "min_price": 30
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
                 }
             ],
             "prepaid_settings" : [
@@ -2623,14 +2912,8 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 480,
+                            "prepaid_duration": 1440,
                             "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 240,
-                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2642,32 +2925,132 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 480,
+                            "carry_over_duration": 1440,
                             "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 240,
-                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+            ],
+            "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,
-                            "service_duration": 720,
-                            "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "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" : {
+            "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" : [
 	    ]
         }
diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json
index bcf5ce8..c29f61b 100644
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -66,7 +66,7 @@
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
       "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
       "pop_business_hours": 0
     }
@@ -986,6 +986,45 @@
     }
   ],
     "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" : {
             "payment_settings" : [
                 {
@@ -1050,6 +1089,84 @@
         }
     }],
     "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" : [
                 {
@@ -1114,6 +1231,84 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -1178,6 +1373,84 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -1345,6 +1618,45 @@
         }
     }],
     "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" : {
             "payment_settings" : [
                 {
@@ -1386,6 +1698,123 @@
         }
     }],
     "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" : {
+            "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" : [
                 {

From 80093de9878ca2ef682cb56394205bf5cb22e66e Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 8 Oct 2024 12:50:45 +0200
Subject: [PATCH 15/16] Add libmobilisis for download/update

---
 etc/psa_update/opkg_commands | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands
index 391660a..aa5289a 100755
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -8,12 +8,14 @@ opkg update
 opkg install prepare-update
 #
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
 opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
 opkg --cache /var/cache/opkg --download-only upgrade atbqt
 #
 opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc
 opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
 opkg --cache /var/cache/opkg upgrade atb-dc-libraries
 opkg --cache /var/cache/opkg upgrade atb-plugin-dc

From dabd44197da49c4dea48d812cb84ad911c8b92f8 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 31 Oct 2024 12:09:39 +0100
Subject: [PATCH 16/16] Update files (provided by Thomas)

---
 etc/psa_config/DC2C_cash.json    | 12 ++++-----
 etc/psa_config/DC2C_device.json  |  2 +-
 etc/psa_config/DC2C_print30.json | 44 ++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100755 etc/psa_config/DC2C_print30.json

diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json
index 4dc5094..4459e04 100755
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,12 +1,12 @@
 {	     
 "title":"DC2C_cash  ",
-"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],
+"Project":"Klaipeda, Palanga",
+"Version":"1.0.0-2024-10-11",
+"CoinDenom(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
+"CoinValue(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
 "ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":1,
 "BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "LocalTaxRate":21,
diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
index 11c4b03..86a651d 100755
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -17,7 +17,7 @@
 "autoOpen":1,
 "AccPrint":1,
 "DorPrint":0,
-"TokPrint":0,
+"TokPrint":2,
 "CBwarnLev":1600,
 "CBerrLev":1900,
 "BattWarn":11800,
diff --git a/etc/psa_config/DC2C_print30.json b/etc/psa_config/DC2C_print30.json
new file mode 100755
index 0000000..0abf987
--- /dev/null
+++ b/etc/psa_config/DC2C_print30.json
@@ -0,0 +1,44 @@
+{
+"title":"DC2C_pri30",
+"Project":"Klaipeda",
+"Version":"1.0.0-2024-10-11",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 11",
+"feed":"nl",
+"text":"TestTicket:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Adresas: ",
+"vari":"location",	
+"feed":"nl",
+"text":"**Klaipėdos keleivinis transportas ",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+