fix: 710 cent not selectable using minus-button.

This reverts commit 7c97a54d1c.

etc/atbapp/text/HMI_Texte.xml

@@ -940,74 +940,6 @@
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
 	  </Text>
 	</Screen>
-    <Screen name="OVERPAID" screennr="0xB1">
-        <Text textnr="0x30">
-            <lt_LT>Stovėjimo laiko pabaiga:</lt_LT>
-            <en_GB>End of Parking time:</en_GB>
-            <de_DE>Parkende:</de_DE>
-            <ru_RU>Окончание времени парковки:</ru_RU>
-        </Text>
-        <Text textnr="0x31">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text textnr="0x32">
-            <lt_LT>Suma:</lt_LT>
-            <en_GB>Amount:</en_GB>
-            <de_DE>Betrag:</de_DE>
-            <ru_RU>Сумма:</ru_RU>
-        </Text>	
-        <Text textnr="0x33">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text textnr="0x34">
-            <lt_LT>Spausdinti kvitą?</lt_LT>
-            <en_GB>Print receipt?</en_GB>
-            <de_DE>Quittung drucken?</de_DE>
-            <ru_RU>Распечатать квитанцию?</ru_RU>
-        </Text>
-        <Text textnr="0x35">
-            <lt_LT>ATŠAUKTI</lt_LT>
-            <en_GB>NO</en_GB>
-            <de_DE>NEIN</de_DE>
-            <ru_RU>НЕТ</ru_RU>
-        </Text>	  
-        <Text textnr="0x36">
-            <lt_LT>TĘSTI</lt_LT>
-            <en_GB>YES</en_GB>
-            <de_DE>JA</de_DE>
-            <ru_RU>ДА</ru_RU>
-        </Text>
-        <Text textnr="0x37">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text name="user_message_01" textnr="0x81">	      
-            <lt_LT>Permoka!</lt_LT>
-            <en_GB>Overpaid</en_GB>
-            <de_DE>Überbezahlt</de_DE>
-            <ru_RU>Переплата!</ru_RU>
-        </Text>
-        <Text name="user_message_02"  textnr="0x82">
-            <lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
-            <en_GB>Reached maximum number of coins.!</en_GB>
-            <de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
-            <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
-        </Text>
-        <Text name="user_message_04"  textnr="0x84">
-            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
-            <en_GB>Minimum parking fee</en_GB>
-            <de_DE>Mindestparkgebühr</de_DE>
-            <ru_RU>Минимальная плата за парковку</ru_RU>
-        </Text>
-    </Screen>
 	<Screen name="Welcome2" screennr="0x3d">
                 <Text textnr="0x30">
 			<lt_LT>Sveiki!</lt_LT>
@@ -2568,61 +2500,5 @@
             <de_DE>880012344</de_DE>
             <ru_RU>880012344</ru_RU>
         </Text>
-    </Screen>
+    </Screen>	
-    <Screen name="COMMON_USER_MESSAGES" screennr="0xF3">
-        <Text  name="PAY_MORE" textnr="0x30">
-            <lt_LT>Mokėti daugiau</lt_LT>
-            <en_GB>pay more…</en_GB>
-            <de_DE>mehr zahlen…</de_DE>
-            <ru_RU>платить больше</ru_RU>
-        </Text>
-        <Text  name="PAY_APPROPRIATELY" textnr="0x31">
-            <lt_LT>suteikite tikslią sumą…</lt_LT>
-            <en_GB>give the exact money…</en_GB>
-            <de_DE>passend zahlen…</de_DE>
-            <ru_RU>предоставьте точную сумму…</ru_RU>
-        </Text>
-        <Text  name="NO_CANGE" textnr="0x32">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text  name="MINIMUM_PRICE" textnr="0x33">
-            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
-            <en_GB>Minimum parking fee</en_GB>
-            <de_DE>Mindestparkgebühr</de_DE>
-            <ru_RU>Минимальная плата за парковку</ru_RU>
-        </Text>
-        <Text  name="MAXIMUM_PRICE" textnr="0x34">
-            <lt_LT>Maksimali bilieto suma</lt_LT>
-            <en_GB>Max. Ticket amount</en_GB>
-            <de_DE>Höchstparkdauer erreicht</de_DE>
-            <ru_RU>Максимальная сумма билета</ru_RU>
-        </Text>
-        <Text  name="CARDPAYMENT_ONLY" textnr="0x35">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text  name="CASHPAYMENT_ONLY" textnr="0x36">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text  name="OVERPAID" textnr="0x37">
-            <lt_LT>Permoka!</lt_LT>
-            <en_GB>Overpaid</en_GB>
-            <de_DE>Überbezahlt</de_DE>
-            <ru_RU>Переплата!</ru_RU>
-        </Text>
-        <Text  name="MAXIMUM_NUM_OF_COINS" textnr="0x38">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-    </Screen>
 </ATB_Text>

etc/psa_config/DC2C_print03.json

@@ -8,14 +8,13 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"styl":"size 00",
 "text":"Sumokėta grynais:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Raudonoji zona",
+"text":"Geltonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",

etc/psa_config/DC2C_print07.json

@@ -4,17 +4,17 @@
 "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 kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Raudonoji zona",
+"text":"Geltonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",

etc/psa_tariff/tariff01.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.1.0-2024-12-13T12:36:12+02:00",
+  "Version" : "2.1.0-2024-04-23T12:36:12+02:00",
   "Info"    : "Red Zone (center)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "20:00:00",
+      "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": "20:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -2212,8 +2212,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2239,8 +2239,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2257,9 +2257,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2295,8 +2295,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2322,8 +2322,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2340,9 +2340,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2378,8 +2378,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2405,8 +2405,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2423,9 +2423,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2459,8 +2459,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2486,8 +2486,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2504,9 +2504,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2542,8 +2542,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2569,8 +2569,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2587,9 +2587,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2625,8 +2625,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2652,8 +2652,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2670,9 +2670,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2708,8 +2708,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2735,8 +2735,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2753,9 +2753,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2791,8 +2791,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2818,8 +2818,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2836,9 +2836,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }

etc/psa_tariff/tariff02.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
   "Info"    : "Yellow Zone (plus)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "18:00:00",
+      "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": "18:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -986,45 +986,6 @@
     }
   ],
     "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" : [
                 {
@@ -1051,8 +1012,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1078,8 +1039,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1096,9 +1057,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1108,84 +1069,6 @@
         }
     }],
     "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" : [
                 {
@@ -1212,8 +1095,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1239,8 +1122,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1257,9 +1140,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1269,84 +1152,6 @@
         }
     }],
     "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" : [
                 {
@@ -1373,8 +1178,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1400,8 +1205,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1418,9 +1223,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1430,84 +1235,6 @@
         }
     }],
     "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" : [
                 {
@@ -1534,8 +1261,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1561,8 +1288,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1579,9 +1306,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1591,45 +1318,6 @@
         }
     }],
     "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" : [
                 {
@@ -1656,8 +1344,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1683,8 +1371,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1701,64 +1389,25 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "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" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 30,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 840,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1766,8 +1415,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1779,144 +1440,57 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "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" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 30,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 840,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1924,8 +1498,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1937,17 +1523,47 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }]
 }

etc/psa_tariff/tariff03.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Version" : "2.1.0-2025-04-23T12:36:12+02:00",
   "Info"    : "Red Zone ()",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "20:00:00",
+      "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": "20:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -2186,45 +2186,6 @@
     }
   ],
     "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" : [
                 {
@@ -2251,8 +2212,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2278,8 +2239,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2296,9 +2257,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2308,84 +2269,6 @@
         }
     }],
     "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" : [
                 {
@@ -2412,8 +2295,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2439,8 +2322,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2457,9 +2340,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2469,52 +2352,13 @@
         }
     }],
     "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,
+                    "min_time" : 12,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 2100,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -2522,8 +2366,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2535,14 +2391,44 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
 	    ]
@@ -2573,8 +2459,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2600,8 +2486,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2618,9 +2504,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2630,84 +2516,6 @@
         }
     }],
     "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" : [
                 {
@@ -2734,8 +2542,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2761,8 +2569,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2779,9 +2587,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2791,45 +2599,6 @@
         }
     }],
     "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" : [
                 {
@@ -2856,8 +2625,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2883,8 +2652,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2901,9 +2670,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 240,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2913,52 +2682,13 @@
         }
     }],
     "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" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 12,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 2100,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -2966,8 +2696,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2979,144 +2721,57 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
 	    ]
         }
     }],
     "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" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 12,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 2100,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -3124,8 +2779,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -3137,14 +2804,44 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
 	    ]

etc/psa_tariff/tariff04.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
   "Info"    : "Yellow Zone (center)",
   "Currency": [
     {
@@ -986,45 +986,6 @@
     }
   ],
     "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" : [
                 {
@@ -1085,50 +1046,11 @@
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Tuesday" : [{
-        "2024-12-24" : {
+        "2025-06-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,
@@ -1227,88 +1149,10 @@
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "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" : [
                 {
@@ -1373,45 +1217,6 @@
         }
     }],
     "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" : [
                 {
@@ -1449,7 +1254,7 @@
             "service_settings" : [
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         },
         "default" : {
             "payment_settings" : [
@@ -1515,7 +1320,7 @@
         }
     }],
     "Friday" : [{
-        "2024-11-01" : {
+        "2025-08-15" : {
             "payment_settings" : [
                 {
                     "min_time" : 0,
@@ -1618,45 +1423,6 @@
         }
     }],
     "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" : [
                 {
@@ -1698,84 +1464,6 @@
         }
     }],
     "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" : [
                 {
@@ -1815,6 +1503,84 @@
             "out_of_service_settings" : [
 	    ]
         },
+        "2025-06-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" : [
+	    ]
+        },
+        "2025-07-06" : {
+            "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" : [
                 {

etc/psa_tariff/tariff05.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.1.0-2024-12-16T13:36:12+02:00",
+  "Version" : "2.1.0-2025-04-23T13:36:12+02:00",
   "Info"    : "Red Zone (center)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "20:00:00",
+      "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": "20:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -2206,8 +2206,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2226,8 +2226,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2238,9 +2238,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2270,8 +2270,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2290,8 +2290,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2302,9 +2302,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2334,8 +2334,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2354,8 +2354,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2366,9 +2366,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2398,8 +2398,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2418,8 +2418,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2430,9 +2430,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2462,8 +2462,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2482,8 +2482,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2494,9 +2494,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2526,8 +2526,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2546,8 +2546,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2558,9 +2558,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2590,8 +2590,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2610,8 +2610,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2622,9 +2622,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 840,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }

etc/psa_tariff/tariff06.json

@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
+  "Version" : "1.0.0-2025-06-05T12:10:00+02:00",
-  "Info"    : "Yellow Zone (center)",
+  "Info"    : "Yellow Zone (Yello Parujis)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -37,13 +37,13 @@
   "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,
@@ -58,10 +58,10 @@
       "pop_payment_method_id": 5,
       "pop_min_time": 30,
       "comment_pop_min_time": "12mins -> 30 cent",
-      "pop_max_time": 840,
+      "pop_max_time": 720,
-      "comment_pop_max_time": "840mins = 14h -> 21 euros",
+      "comment_pop_max_time": "720mins = 12h x 0,6euros/h -> 7,20 euros",
       "pop_min_price": 30,
-      "pop_max_price": 840,
+      "pop_max_price": 720,
       "pop_plus_steps": 10,
       "pop_minus_steps": 1,
       "pop_time_step_config": 1,
@@ -435,97 +435,47 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 72,
-        "pra_price": 720
+        "pra_price": 710
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 73,
-        "pra_price": 730
+        "pra_price": 710
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 74,
-        "pra_price": 740
+        "pra_price": 710
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 75,
-        "pra_price": 750
+        "pra_price": 710
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 76,
-        "pra_price": 760
+        "pra_price": 710
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 77,
-        "pra_price": 770
+        "pra_price": 710 
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 78,
-        "pra_price": 780
+        "pra_price": 710 
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 79,
-        "pra_price": 790
+        "pra_price": 710 
     },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 80,
-        "pra_price": 800
+        "pra_price": 720
-    },
-    {
-        "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": [
@@ -890,50 +840,51 @@
         "pun_label": "710 min"
     },
     {
-        "pun_duration": 720,
+        "pun_duration": 710,
         "pun_id": 72,
-        "pun_label": "720 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 730,
+        "pun_duration": 710,
         "pun_id": 73,
-        "pun_label": "730 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 740,
+        "pun_duration": 710,
         "pun_id": 74,
-        "pun_label": "740 min"
+        "pun_label": "710 min"
     },
     {
         "pun_duration": 750,
         "pun_id": 75,
-        "pun_label": "750 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 760,
+        "pun_duration": 710,
         "pun_id": 76,
-        "pun_label": "760 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 770,
+        "pun_duration": 710,
         "pun_id": 77,
-        "pun_label": "770 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 780,
+        "pun_duration": 710,
         "pun_id": 78,
-        "pun_label": "780 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 790,
+        "pun_duration": 710,
         "pun_id": 79,
-        "pun_label": "790 min"
+        "pun_label": "710 min"
     },
     {
-        "pun_duration": 800,
+        "pun_duration": 720,
         "pun_id": 80,
-        "pun_label": "800 min"
+        "pun_label": "720 min"
     },
+
     {
         "pun_duration": 810,
         "pun_id": 81,
@@ -990,8 +941,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 30,
-                    "max_time" : 840,
+                    "max_time" : 720,
-                    "max_price": 840,
+                    "max_price": 720,
                     "min_price": 30
                 }
             ],
@@ -1006,8 +957,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1026,8 +977,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1038,9 +989,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -1050,51 +1001,12 @@
         }
     }],
     "Tuesday" : [{
-        "2025-06-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" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
                     "min_time" : 30,
-                    "max_time" : 840,
+                    "max_time" : 720,
-                    "max_price": 840,
+                    "max_price": 720,
                     "min_price": 30
                 }
             ],
@@ -1109,8 +1021,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1129,8 +1041,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1141,15 +1053,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
             ],
             "out_of_service_settings" : [
-	        ]
+	    ]
         }
     }],
     "Wednesday" : [{
@@ -1157,8 +1069,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 30,
-                    "max_time" : 840,
+                    "max_time" : 720,
-                    "max_price": 840,
+                    "max_price": 720,
                     "min_price": 30
                 }
             ],
@@ -1173,8 +1085,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1193,8 +1105,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1205,63 +1117,24 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
             ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Thursday" : [{
-        "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" : [
 	        ]
-        },
+        }
+    }],
+    "Thursday" : [{
         "default" : {
             "payment_settings" : [
                 {
                     "min_time" : 30,
-                    "max_time" : 840,
+                    "max_time" : 720,
-                    "max_price": 840,
+                    "max_price": 720,
                     "min_price": 30
                 }
             ],
@@ -1276,8 +1149,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1296,8 +1169,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1308,9 +1181,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -1320,51 +1193,12 @@
         }
     }],
     "Friday" : [{
-        "2025-08-15" : {
-            "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_time" : 720,
-                    "max_price": 840,
+                    "max_price": 720,
                     "min_price": 30
                 }
             ],
@@ -1378,9 +1212,9 @@
                             "prepaid_end": "08:00:00"
                         },
                         {
-                            "prepaid_id" : 2,
+                            "prepaid_id" : 3,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "18:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1399,8 +1233,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "18:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -1411,25 +1245,25 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Saturday" : [{
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 30,
-                    "max_time" : 0,
+                    "max_time" : 720,
-                    "max_price": 0,
+                    "max_price": 720,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1437,8 +1271,14 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "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"
                         }
                     ]
@@ -1450,144 +1290,44 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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" : [{
-        "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" : [
-	    ]
-        },
-        "2025-06-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" : [
-	    ]
-        },
-        "2025-07-06" : {
-            "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,
+                    "min_time" : 30,
-                    "max_time" : 0,
+                    "max_time" : 720,
-                    "max_price": 0,
+                    "max_price": 720,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1595,8 +1335,14 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "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"
                         }
                     ]
@@ -1608,17 +1354,34 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "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" : [
-	    ]
+	        ]
         }
     }]
 }