fixed typo: cach -> cache

... upgrade does not work for packages which are not installed

etc/atbapp/ATBAPP.ini

@@ -1,115 +1,7 @@
-[COMMON]
-com_port_name=/dev/ttyS1
-com_baud_rate=9600
-lang1=lt_LT
-lang2=en_GB
-lang3=de_DE
-lang4=ru_RU
-lang5=
-
-defaultLanguage=1
-CharacterSet="ISO 8859-13"
-
-showInfoButton=false
-showHelpButton=false
-
-#useLanguage=[128+][64+][32+][16]
-useLanguage=240
-#usePayment=[128+][64+][32+][16]
-usePayment=96
-#useVehicle=[128+][64+][32+][16+][8]
-useVehicle=192
-#useProduct=[128+][64+][32+][16+][8]
-useProduct=192
-
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
-logfile=/var/log/atbqt.log
-alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
-
-feature_Log=off
-feature_TouchFeedback=off
-feature_StartButton=on
-feature_selfOOO=off
-feature_ShowParkingTime=off
-
-suspend_methode=sysfs
-suspend_program=
-suspend_time=8
-
-touch_feedback_gpio=121
-touch_feedback_on_value=1
-touch_feedback_off_value=0
-
-#ooo_mode={useDisk|otherMachine}
-ooo_mode=otherMachine
-sellTimeout_time=60
-
-showInfoButton=false
-showHelpButton=false
-
-useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
-
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_3F="1,0,0"
-sc_40="1,0,1"
-sc_41="1,0,0"
-sc_35="0,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_53="1,0,0"
-
-
-[PLUGINS]
-CCPlugin=AsyncPOS_CCPlugin
-CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=ATBDeviceControllerPlugin
-
-
-[IngenicoISelf_CCPlugin]
-debug=1
-PortName=/dev/ttymxc0
-ZVT=DE
-sleep=1
-sleepExtended=1
-Currency=HUF
-
-
-[TCP_CONTROL]
-enable=1
-
-
-[PAYMENT]
-currencySymbol=€
-currencyISOCode=EUR
-cashVariant=CoinsAndNotes
-paymentPointInTime=poa
-useDecimal=yes
-
-
-[MOBILISIS_CalculatePricePlugin]
-useDebug=1
-tariffFileName=/etc/psa_tariff/tariff01.json
-
 [ATBDeviceControllerPlugin]
+printerEncoding=Windows-1257
+printerLocale=lt_LT
 serialPort=ttymxc2
-printerEncoding="Windows-1257"
-printerLocale="lt_LT"
-
-[TCP_ZVT_CCPlugin]
-CurrencyCode=EUR
-debug=1
-IP=192.168.6.242
-Port=22000
-SSL=0
-ZVT=DE
-sleep=1
-printIntermediateStatus=1
-Password=277296
-NumberOfChars=37
-dcHours="0"
 
 [AsyncPOS_CCPlugin]
 APAK=8AC304380E0E476BA2558B75DB9E2516
@@ -123,3 +15,101 @@ parity=0
 sleep=0
 stopBits=1
 terminalPowerOnOffHours="06:00:00,22:00:00"
+
+[COMMON]
+%23ooo_mode={useDisk|otherMachine}
+%23useLanguage=[128+][64+][32+][16]
+%23usePayment=[128+][64+][32+][16]
+%23useProduct=[128+][64+][32+][16+][8]
+%23useVehicle=[128+][64+][32+][16+][8]
+CharacterSet=ISO 8859-13
+alternativeLogoFile=/opt/app/ATBAPP/logo/logo_Palanga.png
+com_baud_rate=9600
+com_port_name=/dev/ttyS1
+defaultLanguage=1
+feature_DBusDisplayControl=on
+feature_DBusDisplayDimLow=off
+feature_DBusSuspendControl=off
+feature_Log=off
+feature_ShowParkingTime=off
+feature_StartButton=on
+feature_TouchFeedback=off
+feature_selfOOO=off
+lang1=lt_LT
+lang2=en_GB
+lang3=de_DE
+lang4=ru_RU
+lang5=
+logfile=/var/log/atbqt.log
+ooo_alternativeLocation=
+ooo_mode=otherMachine
+ooo_serviceEmail=
+ooo_serviceNumber=
+sellTimeout_time=60
+showHelpButton=false
+showInfoButton=false
+statefile=/etc/atbapp/states/APP_States.xml
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+textfile=/etc/atbapp/text/HMI_Texte.xml
+touch_feedback_gpio=121
+touch_feedback_off_value=0
+touch_feedback_on_value=1
+useAppStates=1
+useLanguage=240
+usePayment=96
+useProduct=192
+useVehicle=192
+
+[IngenicoISelf_CCPlugin]
+Currency=HUF
+PortName=/dev/ttymxc0
+ZVT=DE
+debug=1
+sleep=1
+sleepExtended=1
+
+[MOBILISIS_CalculatePricePlugin]
+tariffFileName=/etc/psa_tariff/tariff01.json
+useDebug=1
+
+[PAYMENT]
+cashVariant=CoinsAndNotes
+currencyISOCode=EUR
+currencySymbol=€
+paymentPointInTime=poa
+useDecimal=yes
+useHonestPayment=on
+
+[PLUGINS]
+CCPlugin=AsyncPOS_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_35="0,0,0"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+[TCP_CONTROL]
+enable=1
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+IP=192.168.6.242
+NumberOfChars=37
+Password=277296
+Port=22000
+SSL=0
+ZVT=DE
+dcHours=0
+debug=1
+printIntermediateStatus=1
+sleep=1

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-04-23T12:36:12+02:00",
+  "Version" : "2.1.0-2024-12-13T12:36:12+02:00",
   "Info"    : "Red Zone (center)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "20:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "20:00:00"
     },
     {
       "time_range_id": 3,
@@ -2206,14 +2206,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2232,15 +2226,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2251,15 +2238,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2289,14 +2270,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2315,15 +2290,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2334,15 +2302,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2378,8 +2340,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2405,8 +2367,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2423,9 +2385,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 480,
+                            "service_duration": 360,
                             "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2453,14 +2415,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2479,15 +2435,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2498,15 +2447,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2536,14 +2479,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2562,15 +2499,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2581,15 +2511,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2619,14 +2543,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2645,15 +2563,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2664,15 +2575,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2702,14 +2607,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2728,15 +2627,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2747,15 +2639,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2785,14 +2671,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "20:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2811,15 +2691,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "20: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"
                         }
                     ]
@@ -2830,15 +2703,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "20:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }

etc/psa_tariff/tariff02.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
   "Info"    : "Yellow Zone (plus)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "18:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "18:00:00"
     },
     {
       "time_range_id": 3,
@@ -986,6 +986,45 @@
     }
   ],
     "Monday" : [{
+        "2025-04-21" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1006,14 +1045,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 360,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "18:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1032,15 +1065,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 360,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "18: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"
                         }
                     ]
@@ -1051,15 +1077,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 600,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "18:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1069,6 +1089,84 @@
         }
     }],
     "Tuesday" : [{
+        "2024-12-24" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-03-11" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1089,14 +1187,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 360,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "18:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1115,15 +1207,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 360,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "18: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"
                         }
                     ]
@@ -1134,15 +1219,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 600,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "18:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1152,6 +1231,84 @@
         }
     }],
     "Wednesday" : [{
+        "2024-12-25" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-01-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1172,14 +1329,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 360,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "18:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1198,15 +1349,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 360,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "18: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"
                         }
                     ]
@@ -1217,15 +1361,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 600,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "18:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1235,6 +1373,84 @@
         }
     }],
     "Thursday" : [{
+        "2024-12-26" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-05-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1255,14 +1471,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 360,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "18:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1281,15 +1491,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 360,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "18: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"
                         }
                     ]
@@ -1300,15 +1503,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 600,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "18:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1318,6 +1515,45 @@
         }
     }],
     "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" : [
                 {
@@ -1338,14 +1574,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 360,
-                            "prepaid_start" : "12:00:00",
+                            "prepaid_start" : "18:00:00",
-                            "prepaid_end": "14:00:00"
-                        },
-                        {
-                            "prepaid_id" : 3,
-                            "prepaid_duration": 120,
-                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1364,15 +1594,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 360,
-                            "carry_over_start" : "12:00:00",
+                            "carry_over_start" : "18: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"
                         }
                     ]
@@ -1383,31 +1606,25 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 240,
+                            "service_duration": 600,
                             "service_start" : "08:00:00",
-                            "service_end": "12:00:00"
+                            "service_end": "18:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
             ],
             "out_of_service_settings" : [
-	        ]
+	    ]
         }
     }],
     "Saturday" : [{
-        "default" : {
+        "2024-11-02" : {
             "payment_settings" : [
                 {
-                    "min_time" : 30,
+                    "min_time" : 0,
-                    "max_time" : 840,
+                    "max_time" : 0,
-                    "max_price": 840,
+                    "max_price": 0,
-                    "min_price": 30
+                    "min_price": 0
                 }
             ],
             "prepaid_settings" : [
@@ -1415,20 +1632,8 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 480,
+                            "prepaid_duration": 1440,
                             "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 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"
                         }
                     ]
@@ -1440,57 +1645,66 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 480,
+                            "carry_over_duration": 1440,
                             "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 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" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "default" : {
+            "payment_settings" : [
                 {
-                    "service_ranges" : [
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
                         {
-                            "service_id" : 1,
+                            "prepaid_id" : 1,
-                            "service_duration": 240,
+                            "prepaid_duration": 1440,
-                            "service_start" : "08:00:00",
+                            "prepaid_start" : "00:00:00",
-                            "service_end": "12:00:00"
+                            "prepaid_end": "24:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
             ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
             "out_of_service_settings" : [
-	        ]
+	    ]
         }
     }],
     "Sunday" : [{
-        "default" : {
+        "2025-02-16" : {
             "payment_settings" : [
                 {
-                    "min_time" : 30,
+                    "min_time" : 0,
-                    "max_time" : 840,
+                    "max_time" : 0,
-                    "max_price": 840,
+                    "max_price": 0,
-                    "min_price": 30
+                    "min_price": 0
                 }
             ],
             "prepaid_settings" : [
@@ -1498,20 +1712,8 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 480,
+                            "prepaid_duration": 1440,
                             "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 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"
                         }
                     ]
@@ -1523,47 +1725,134 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 480,
+                            "carry_over_duration": 1440,
                             "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 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" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-04-20" : {
+            "payment_settings" : [
                 {
-                    "service_ranges" : [
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
                         {
-                            "service_id" : 1,
+                            "prepaid_id" : 1,
-                            "service_duration": 240,
+                            "prepaid_duration": 1440,
-                            "service_start" : "08:00:00",
+                            "prepaid_start" : "00:00:00",
-                            "service_end": "12:00:00"
+                            "prepaid_end": "24:00:00"
-                        },
-                        {
-                            "service_id" : 2,
-                            "service_duration": 480,
-                            "service_start" : "14:00:00",
-                            "service_end": "22:00:00"
                         }
                     ]
                 }
             ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
             "out_of_service_settings" : [
-	        ]
+	    ]
+        },
+        "2025-05-04" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
         }
     }]
 }

etc/psa_tariff/tariff04.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
   "Info"    : "Yellow Zone (center)",
   "Currency": [
     {
@@ -986,71 +986,7 @@
     }
   ],
     "Monday" : [{
-        "default" : {
+        "2025-04-21" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 30,
-                    "max_time" : 840,
-                    "max_price": 840,
-                    "min_price": 30
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 480,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "08:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 360,
-                            "prepaid_start" : "18:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 480,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "08:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 360,
-                            "carry_over_start" : "18:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 600,
-                            "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	        ]
-        }
-    }],
-    "Tuesday" : [{
-        "2025-06-24" : {
             "payment_settings" : [
                 {
                     "min_time" : 0,
@@ -1149,10 +1085,230 @@
                 }
             ],
             "out_of_service_settings" : [
-	        ]
+	    ]
+        }
+    }],
+    "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" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 360,
+                            "prepaid_start" : "18:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 360,
+                            "carry_over_start" : "18:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 600,
+                            "service_start" : "08:00:00",
+                            "service_end": "18:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
         }
     }],
     "Wednesday" : [{
+        "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" : [
                 {
@@ -1217,6 +1373,45 @@
         }
     }],
     "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" : [
                 {
@@ -1254,7 +1449,7 @@
             "service_settings" : [
             ],
             "out_of_service_settings" : [
-	        ]
+	    ]
         },
         "default" : {
             "payment_settings" : [
@@ -1320,7 +1515,7 @@
         }
     }],
     "Friday" : [{
-        "2025-08-15" : {
+        "2024-11-01" : {
             "payment_settings" : [
                 {
                     "min_time" : 0,
@@ -1423,6 +1618,45 @@
         }
     }],
     "Saturday" : [{
+        "2024-11-02" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1464,6 +1698,84 @@
         }
     }],
     "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" : [
                 {
@@ -1503,84 +1815,6 @@
             "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-2025-04-23T13:36:12+02:00",
+  "Version" : "2.1.0-2024-12-16T13:36:12+02:00",
   "Info"    : "Red Zone (center)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "20:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "20:00:00"
     },
     {
       "time_range_id": 3,
@@ -2206,8 +2206,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2226,8 +2226,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2238,9 +2238,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2270,8 +2270,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2290,8 +2290,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2302,9 +2302,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2334,8 +2334,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2354,8 +2354,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2366,9 +2366,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2398,8 +2398,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2418,8 +2418,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2430,9 +2430,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2462,8 +2462,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2482,8 +2482,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2494,9 +2494,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2526,8 +2526,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2546,8 +2546,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2558,9 +2558,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }
@@ -2590,8 +2590,8 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 120,
+                            "prepaid_duration": 240,
-                            "prepaid_start" : "22:00:00",
+                            "prepaid_start" : "20:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2610,8 +2610,8 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 120,
+                            "carry_over_duration": 240,
-                            "carry_over_start" : "22:00:00",
+                            "carry_over_start" : "20:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2622,9 +2622,9 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 840,
+                            "service_duration": 720,
                             "service_start" : "08:00:00",
-                            "service_end": "22:00:00"
+                            "service_end": "20:00:00"
                         }
                     ]
                 }