From 0debdcab84118746848023b23dcaa31d47dba6f1 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Fri, 25 Apr 2025 11:48:52 +0200
Subject: [PATCH] usual saturday/sunday has to be paid for

---
 etc/psa_tariff/tariff02_sommer.json | 118 ++++++++++++++++++++++++----
 1 file changed, 101 insertions(+), 17 deletions(-)

diff --git a/etc/psa_tariff/tariff02_sommer.json b/etc/psa_tariff/tariff02_sommer.json
index 1e699ee..1f2bfb5 100644
--- a/etc/psa_tariff/tariff02_sommer.json
+++ b/etc/psa_tariff/tariff02_sommer.json
@@ -1514,17 +1514,17 @@
                 }
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         }
     }],
     "Saturday" : [{
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1532,8 +1532,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"
                         }
                     ]
@@ -1545,17 +1557,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" : [
-	    ]
+	        ]
         }
     }],
     "Sunday" : [{
@@ -1635,7 +1677,7 @@
             "service_settings" : [
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         },
         "2025-07-06" : {
             "payment_settings" : [
@@ -1674,15 +1716,15 @@
             "service_settings" : [
             ],
             "out_of_service_settings" : [
-	    ]
+	        ]
         },
         "default" : {
             "payment_settings" : [
                 {
-                    "min_time" : 0,
-                    "max_time" : 0,
-                    "max_price": 0,
-                    "min_price": 0
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
                 }
             ],
             "prepaid_settings" : [
@@ -1690,8 +1732,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"
                         }
                     ]
@@ -1703,17 +1757,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" : [
-	    ]
+	        ]
         }
     }]
 }