Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1

etc/psa_config/DC2C_cash.json

@@ -1,18 +1,17 @@
-{	     
+{	     
-"title":"DC2C_cash  ",
+"title":"DC2C_cash  ",
-"project":"Klaipeda",
+"Project":"Klaipeda",
-"version":"1.0.0-2024-06-28",
+"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,1],
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,50,20,10,5,2,1,1],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,50,20,10,5,2,1,3],
-"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
-"ExchangeRate":1,
+"ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":6,
-"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
-"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
-"LocalTaxRate":19,
+"LocalTaxRate":21,
-"ForeignTaxRate":0,
+"ForeignTaxRate":0,
-"Surcharge":0,	
+"Surcharge":0,	
-"Discount":0
+"Discount":0
-}
+}
-#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
+
-

etc/psa_config/DC2C_device.json

@@ -1,30 +1,37 @@
-{
+{
-"title":"DC2C_device",
+"title":"DC2C_device",
-"project":"Klaipeda",
+"Project":"Klaipeda",
-"Version":"1.0.0-2024-06-28",
+"Version":"6.8.0-2024-06-27",
-"printer":1,
+"printer":1,
-"coinChk":1,
+"coinChk":1,
-"mifRd":1,
+"mifRd":1,
-"solarPwr":0,
+"solarPwr":1,
-"modem":1,
+"modem":1,
-"creditCard":1,
+"creditCard":1,
-"escrow":1,
+"escrow":1,
-"RejMotor":0,
+"RejMotor":0,
-"shutter":1,
+"shutter":1,
-"billRd":0,
+"billRd":0,
-"vaultLock":0,
+"vaultLock":0,
-"autoAlarm":1,
+"autoAlarm":1,
-"autoOpen":1,
+"autoOpen":1,
-"AccPrint":1,
+"AccPrint":2,
-"DorPrint":1,
+"DorPrint":1,
-"TokPrint":1,
+"TokPrint":1,
-"CBwarnLev":1600,
+"CBwarnLev":1600,
-"CBerrLev":1900,
+"CBerrLev":1900,
-"BattWarn":11800,
+"BattWarn":11800,
-"BattErr":11200,
+"BattErr":11200,
-"foreign":1,
+"foreign":4,
-"refundPrint":1,
+"refundPrint":1,
-"billWarnLev":400,
+"billWarnLev":300,
-"billFullLev":500,
+"billFullLev":380,
-"housing":1
+"housing":1,
-}
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
+
+
+}

etc/psa_config/DC2C_print01.json

@@ -1,31 +1,23 @@
 {
 "title":"DC2C_pri01",
 "project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-24",
+"text":"",
 "styl":"font 10",
-"styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"graf":"logo1",
+"styl":"size 10",
-"text":"Klaipeda",
+"text":"Parking Ticket",
-"feed":"nl"
+"styl":"size 00",
-"feed":"nl"
+"feed":"nl",
-"text":"Parkschein",
+"text":"Please put clearly",
+"feed":"nl",
+"text":"visible behind your",
+"text":"wind screen",
 "feed":"nl",
 "feed":"nl",
-"styl":"size 00",
+"text":"Your license plate:"
-"styl":"align l",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl"
 }
 
 
@@ -39,3 +31,4 @@
 
 
 
+

etc/psa_config/DC2C_print02.json

@@ -1,15 +1,30 @@
 {
 "title":"DC2C_pri02",
 "project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-24",
-"issued":"13.11.2023 01.01",
 "feed":"nl",
-"text":"Bezahlt: ",
 "styl":"size 11",
-"vari":"Dynamic07",
+"vari":"Dynamic01",
-"text":"",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parking end:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Printed at:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"time short",
+"vari":"date us",
+"styl":"size 00",
+"feed":"nl",
+"text":"Payed:",
+"feed":"nl",
+"vari":"Dynamic07",
 "feed":"nl",
-"styl":"size 00"
 }
 
 

etc/psa_config/DC2C_print03.json

@@ -1,21 +1,27 @@
 {
 "title":"DC2C_pri03",
 "project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-24",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
+"text":"Ticket nr.:",
+"vari":"Dynamic08",
 "feed":"nl",
-"vari":"location",
+"text":"CustomerNr.: ",
-"text":"Automat: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
 "vari":"manu",	
+"text":"Place: ",
 "feed":"nl",
-"styl":"align c",
+"vari":"location",	
-"text":"Bitte gut sichtbar",
 "feed":"nl",
-"text":"hinter die Scheibe",
+"text":"Automato adresas: S.Daukanto g. 2",
 "feed":"nl",
-"text":"legen",
+"text":"VDA Automobilio stovejimo aikoteles",
+"feed":"nl",
+"text":"Puodpio g. 24-1, LT-44295, Kaunas,",
+"feed":"nl",
+"text":"Am. kodas 134929849 PVM kodas LT349298414",
 "feed":"nl",
 "feed":"eject"
 }
@@ -31,3 +37,4 @@
 
 
 
+

etc/psa_config/DC2C_print04.json

@@ -1,6 +1,19 @@
 {
 "title":"DC2C_pri04",
 "project":"Klaipeda",
-"Version":"15.11.2023 01.01",
+"Version":"6.7.1-2024-06-24",
-"text":"";
+"styl":"size 00"
-}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print05.json

@@ -1,31 +1,23 @@
 {
 "title":"DC2C_pri05",
 "project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-24",
+"text":"",
 "styl":"font 10",
-"styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"graf":"logo1",
+"styl":"size 10",
-"text":"Klaipeda",
+"text":"Parking Ticket",
-"feed":"nl"
+"styl":"size 00",
-"feed":"nl"
+"feed":"nl",
-"text":"Parkschein",
+"text":"Please put clearly",
+"feed":"nl",
+"text":"visible behind your",
+"text":"wind screen",
 "feed":"nl",
 "feed":"nl",
-"styl":"size 00",
+"text":"Your license plate:"
-"styl":"align l",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl"
 }
 
 
@@ -39,3 +31,4 @@
 
 
 
+

etc/psa_config/DC2C_print06.json

@@ -1,16 +1,30 @@
 {
 "title":"DC2C_pri06",
 "project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-24",
-"issued":"13.11.2023 01.01",
 "feed":"nl",
-"text":"Bezahlt: ",
 "styl":"size 11",
-"vari":"Dynamic07",
+"vari":"Dynamic01",
-"text":"",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parking end:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Printed at:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"time short",
+"vari":"date us",
+"styl":"size 00",
+"feed":"nl",
+"text":"Payed:",
+"feed":"nl",
+"vari":"Dynamic07",
 "feed":"nl",
-"styl":"size 00"
-
 }
 
 

etc/psa_config/DC2C_print07.json

@@ -1,21 +1,27 @@
 {
 "title":"DC2C_pri07",
 "project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-24",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
+"text":"Ticket nr.:",
+"vari":"Dynamic08",
 "feed":"nl",
-"vari":"location",
+"text":"CustomerNr.: ",
-"text":"Automat: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
 "vari":"manu",	
+"text":"Place: ",
 "feed":"nl",
-"styl":"align c",
+"vari":"location",	
-"text":"Bitte gut sichtbar",
 "feed":"nl",
-"text":"hinter die Scheibe",
+"text":"Automato adresas: S.Daukanto g. 2",
 "feed":"nl",
-"text":"legen",
+"text":"VDA Automobilio stovejimo aikoteles",
+"feed":"nl",
+"text":"Puodpio g. 24-1, LT-44295, Kaunas,",
+"feed":"nl",
+"text":"Am. kodas 134929849 PVM kodas LT349298414",
 "feed":"nl",
 "feed":"eject"
 }
@@ -31,3 +37,4 @@
 
 
 
+

etc/psa_config/DC2C_print08.json

@@ -1,6 +1,19 @@
 {
 "title":"DC2C_pri08",
 "project":"Klaipeda",
-"Version":"15.11.2023 01.01",
+"Version":"6.7.1-2024-06-24",
-"text":"";
+"styl":"size 00"
-}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print31.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri31",
-"project":"door close print",
+"Project":"door close print",
-"Version":"15.11.2023 00001",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -9,12 +9,31 @@
 "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"
 }
 

etc/psa_config/DC2C_print32.json

@@ -1,40 +1,38 @@
 {
 "title":"DC2C_pri32",
-"project":"refund reciept",
+"Project":"refund reciept",
-"Version":"15.11.2023 00001",
+"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"
 }

etc/psa_tariff/tariff01.json

@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "",
+  "Info"    : "Red Zone",
   "Currency": [
     {
       "pcu_id": 2,
@@ -46,6 +46,163 @@
       "time_range_to": "08:00:00"
     }
   ],
+  "Prepaid": [
+    {
+        "prepaid_id": 1,
+        "prepaid_anytime": true,
+        "prepaid_never": false
+    },
+    {
+        "prepaid_id": 2,
+        "prepaid_anytime": false,
+        "prepaid_never": true
+    },
+    {
+        "prepaid_id": 3,
+        "prepaid_anytime": false,
+        "prepaid_never": false,
+        "prepaid_static_start": "22:00:00",
+        "prepaid_static_end": "08:00:00"
+    }
+  ],
+  "CarryOver": [
+    {
+      "carry_over_id" : 1,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    },
+    {
+      "carry_over_id" : 2,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    }
+  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
@@ -60,7 +217,11 @@
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
       "pop_max_price": 2100,
+      "pop_plus_steps": 10,
+      "pop_minus_steps": 1,
       "pop_carry_over": 1,
+      "pop_carry_over_option_id": 1,
+      "pop_prepaid_option_id" : 3,
       "pop_carry_over_time_range": 1,
       "pop_carry_over_start_time_range": 2,
       "pop_carry_over_end_time_range": 3,
@@ -69,6 +230,11 @@
     }
   ],
   "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 1,
@@ -1121,6 +1287,11 @@
     }
   ],
   "Duration": [
+    {
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
+    },
     {
 	"pun_duration": 4,
 	"pun_id": 1,
@@ -2216,7 +2387,7 @@
       "pwd_time_to": "22:00:00"
     },
     {
-      "pwd_id": 626,
+      "pwd_id": 627,
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 7,
       "pwd_time_from": "08:00:00",
@@ -2225,12 +2396,20 @@
   ],
   "PeriodYear": [
     {
-      "pye_id": 8,
+      "pye_id": 1,
-      "pye_label": "Whole year",
+      "pye_label": "May - September",
-      "pye_start_month": 1,
+      "pye_start_month": 5,
       "pye_start_day": 1,
-      "pye_end_month": 12,
+      "pye_end_month": 9,
-      "pye_end_day": 31
+      "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
     }
   ]
 }

etc/psa_tariff/tariff02.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
+  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
   "Info"    : "Yellow Zone",
   "Currency": [
     {
@@ -60,7 +60,11 @@
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
       "pop_max_price": 840,
+      "pop_plus_steps": 10,
+      "pop_minus_steps": 1,
       "pop_carry_over": 1,
+      "pop_carry_over_option_id": 1,
+      "pop_prepaid_option_id" : 3,
       "pop_carry_over_time_range": 1,
       "pop_carry_over_start_time_range": 2,
       "pop_carry_over_end_time_range": 3,
@@ -68,7 +72,169 @@
       "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
     }
   ],
+  "Prepaid": [
+    {
+        "prepaid_id": 1,
+        "prepaid_anytime": true,
+        "prepaid_never": false
+    },
+    {
+        "prepaid_id": 2,
+        "prepaid_anytime": false,
+        "prepaid_never": true
+    },
+    {
+        "prepaid_id": 3,
+        "prepaid_anytime": false,
+        "prepaid_never": false,
+        "prepaid_static_start": "22:00:00",
+        "prepaid_static_end": "08:00:00"
+    }
+  ],
+  "CarryOver": [
+    {
+      "carry_over_id" : 1,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 600,
+            "carry_over_static_start" : "22:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    },
+    {
+      "carry_over_id" : 2,
+      "carry_over_week" : [
+          {
+            "carry_over_day" : 1,
+            "carry_over_day_comment" : "Monday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 2,
+            "carry_over_day_comment" : "Tuesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 3,
+            "carry_over_day_comment" : "Wednesday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 4,
+            "carry_over_day_comment" : "Thursday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 5,
+            "carry_over_day_comment" : "Friday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 6,
+            "carry_over_day_comment" : "Saturday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          },
+          {
+            "carry_over_day" : 7,
+            "carry_over_day_comment" : "Sunday",
+            "carry_over_seemless": false,
+            "carry_over_never" : false,
+            "carry_over_duration": 720,
+            "carry_over_static_start" : "20:00:00",
+            "carry_over_static_end": "08:00:00"
+          }
+      ]
+    }
+  ],
   "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 1,
@@ -491,6 +657,11 @@
     }
   ],
   "Duration": [
+    {
+	     "pun_duration": 0,
+	     "pun_id": 0,
+	     "pun_label": "0 min"
+    },
     {
         "pun_duration": 10,
         "pun_id": 1,
@@ -965,12 +1136,20 @@
   ],
   "PeriodYear": [
     {
-      "pye_id": 8,
+      "pye_id": 1,
-      "pye_label": "Whole year",
+      "pye_label": "May - September",
-      "pye_start_month": 1,
+      "pye_start_month": 5,
       "pye_start_day": 1,
-      "pye_end_month": 12,
+      "pye_end_month": 9,
-      "pye_end_day": 31
+      "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
     }
   ]
 }