fix: 710 cent not selectable using minus-button.

This reverts commit 7c97a54d1c.

etc/atbapp/ATBAPP.ini

@@ -1,7 +1,115 @@
+[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
@@ -15,101 +123,3 @@ 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/psa_config/DC2C_print03.json

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

etc/psa_config/DC2C_print07.json

@@ -4,17 +4,17 @@
 "Version":"1.1.3-2024-08-08",
 "styl":"font 24",
 "styl":"csiz 08",
-"styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
+"styl":"size 00",
 "text":"Sumokėta kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Raudonoji zona",
+"text":"Geltonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",

etc/psa_tariff/tariff01.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.1.0-2024-12-13T12:36:12+02:00",
+  "Version" : "2.1.0-2024-04-23T12:36:12+02:00",
   "Info"    : "Red Zone (center)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "20:00:00",
+      "time_range_from": "22:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -2206,8 +2206,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2226,8 +2232,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2238,9 +2251,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2270,8 +2289,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2290,8 +2315,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2302,9 +2334,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2340,8 +2378,8 @@
                         },
                         {
                             "prepaid_id" : 3,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2367,8 +2405,8 @@
                         {
                             "carry_over_id" : 3,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
@@ -2385,9 +2423,9 @@
                         },
                         {
                             "service_id" : 2,
-                            "service_duration": 360,
+                            "service_duration": 480,
                             "service_start" : "14:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2415,8 +2453,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2435,8 +2479,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2447,9 +2498,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2479,8 +2536,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2499,8 +2562,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2511,9 +2581,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2543,8 +2619,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2563,8 +2645,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2575,9 +2664,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2607,8 +2702,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2627,8 +2728,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2639,9 +2747,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2671,8 +2785,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2691,8 +2811,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2703,9 +2830,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12: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-2024-10-01T09:32:12+02:00",
+  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
   "Info"    : "Yellow Zone (plus)",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "18:00:00",
+      "time_range_from": "22:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "18:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -986,45 +986,6 @@
     }
   ],
     "Monday" : [{
-        "2025-04-21" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1045,8 +1006,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1065,8 +1032,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1077,9 +1051,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1089,84 +1069,6 @@
         }
     }],
     "Tuesday" : [{
-        "2024-12-24" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-03-11" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1187,8 +1089,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1207,8 +1115,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1219,9 +1134,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1231,84 +1152,6 @@
         }
     }],
     "Wednesday" : [{
-        "2024-12-25" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-01-01" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1329,8 +1172,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1349,8 +1198,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1361,9 +1217,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1373,84 +1235,6 @@
         }
     }],
     "Thursday" : [{
-        "2024-12-26" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-05-01" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1471,8 +1255,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1491,8 +1281,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1503,9 +1300,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -1515,45 +1318,6 @@
         }
     }],
     "Friday" : [{
-        "2024-11-01" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1574,8 +1338,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 360,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1594,8 +1364,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 360,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "18:00:00",
+                            "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"
                         }
                     ]
@@ -1606,64 +1383,31 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 600,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "18:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Saturday" : [{
-        "2024-11-02" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 30,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 840,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1671,8 +1415,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1684,144 +1440,57 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "carry_over_duration": 480,
                             "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Sunday" : [{
-        "2025-02-16" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-04-20" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-05-04" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 30,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 840,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1829,8 +1498,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -1842,17 +1523,47 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "carry_over_duration": 480,
                             "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }]
 }

etc/psa_tariff/tariff03.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Version" : "2.1.0-2025-04-23T12:36:12+02:00",
   "Info"    : "Red Zone ()",
   "Currency": [
     {
@@ -37,13 +37,13 @@
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "20:00:00",
+      "time_range_from": "22:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
+      "time_range_to": "22:00:00"
     },
     {
       "time_range_id": 3,
@@ -2186,45 +2186,6 @@
     }
   ],
     "Monday" : [{
-        "2025-04-21" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2245,8 +2206,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2265,8 +2232,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2277,9 +2251,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2289,84 +2269,6 @@
         }
     }],
     "Tuesday" : [{
-        "2024-12-24" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-03-11" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2387,8 +2289,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2407,8 +2315,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2419,9 +2334,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2431,52 +2352,13 @@
         }
     }],
     "Wednesday" : [{
-        "2024-12-25" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "2025-01-01" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 12,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 2100,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -2484,8 +2366,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2497,14 +2391,44 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "carry_over_duration": 480,
                             "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
 	    ]
@@ -2529,8 +2453,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2549,8 +2479,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2561,9 +2498,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2573,84 +2516,6 @@
         }
     }],
     "Thursday" : [{
-        "2024-12-26" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-05-01" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2671,8 +2536,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2691,8 +2562,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2703,9 +2581,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2715,45 +2599,6 @@
         }
     }],
     "Friday" : [{
-        "2024-11-01" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -2774,8 +2619,14 @@
                         },
                         {
                             "prepaid_id" : 2,
-                            "prepaid_duration": 240,
+                            "prepaid_duration": 120,
-                            "prepaid_start" : "20:00:00",
+                            "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"
                         }
                     ]
@@ -2794,8 +2645,15 @@
                         {
                             "carry_over_id" : 2,
                             "carry_over_if": "always",
-                            "carry_over_duration": 240,
+                            "carry_over_duration": 120,
-                            "carry_over_start" : "20:00:00",
+                            "carry_over_start" : "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"
                         }
                     ]
@@ -2806,9 +2664,15 @@
                     "service_ranges" : [
                         {
                             "service_id" : 1,
-                            "service_duration": 720,
+                            "service_duration": 240,
                             "service_start" : "08:00:00",
-                            "service_end": "20:00:00"
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
                         }
                     ]
                 }
@@ -2818,52 +2682,13 @@
         }
     }],
     "Saturday" : [{
-        "2024-11-02" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 12,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 2100,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -2871,8 +2696,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -2884,144 +2721,57 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "carry_over_duration": 480,
                             "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
 	    ]
         }
     }],
     "Sunday" : [{
-        "2025-02-16" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-04-20" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-05-04" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
+                    "min_time" : 12,
-                    "max_time" : 0,
+                    "max_time" : 840,
-                    "max_price": 0,
+                    "max_price": 2100,
-                    "min_price": 0
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -3029,8 +2779,20 @@
                     "prepaid_ranges" : [
                         {
                             "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
+                            "prepaid_duration": 480,
                             "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
                             "prepaid_end": "24:00:00"
                         }
                     ]
@@ -3042,14 +2804,44 @@
                         {
                             "carry_over_id" : 1,
                             "carry_over_if": "always",
-                            "carry_over_duration": 1440,
+                            "carry_over_duration": 480,
                             "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
                             "carry_over_end": "24:00:00"
                         }
                     ]
                 }
             ],
             "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
             ],
             "out_of_service_settings" : [
 	    ]

etc/psa_tariff/tariff04.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
   "Info"    : "Yellow Zone (center)",
   "Currency": [
     {
@@ -986,45 +986,6 @@
     }
   ],
     "Monday" : [{
-        "2025-04-21" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1085,50 +1046,11 @@
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Tuesday" : [{
-        "2024-12-24" : {
+        "2025-06-24" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-03-11" : {
             "payment_settings" : [
                 {
                     "min_time" : 0,
@@ -1227,88 +1149,10 @@
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Wednesday" : [{
-        "2024-12-25" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-01-01" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1373,45 +1217,6 @@
         }
     }],
     "Thursday" : [{
-        "2024-12-26" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "2025-05-01" : {
             "payment_settings" : [
                 {
@@ -1449,7 +1254,7 @@
             "service_settings" : [
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         },
         "default" : {
             "payment_settings" : [
@@ -1515,7 +1320,7 @@
         }
     }],
     "Friday" : [{
-        "2024-11-01" : {
+        "2025-08-15" : {
             "payment_settings" : [
                 {
                     "min_time" : 0,
@@ -1618,45 +1423,6 @@
         }
     }],
     "Saturday" : [{
-        "2024-11-02" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "default" : {
             "payment_settings" : [
                 {
@@ -1698,84 +1464,6 @@
         }
     }],
     "Sunday" : [{
-        "2025-02-16" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
-        "2025-04-20" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
-                }
-            ],
-            "prepaid_settings" : [
-                {
-                    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 1440,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-                {
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 1440,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-            ],
-            "out_of_service_settings" : [
-	    ]
-        },
         "2025-05-04" : {
             "payment_settings" : [
                 {
@@ -1815,6 +1503,84 @@
             "out_of_service_settings" : [
 	    ]
         },
+        "2025-06-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "2025-07-06" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 0,
+                    "max_time" : 0,
+                    "max_price": 0,
+                    "min_price": 0
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
         "default" : {
             "payment_settings" : [
                 {

etc/psa_tariff/tariff05.json

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