Merge commit '367789bda28f33a11a72d61b222453c5b502299e' into improve_navigation_cpp

2026-06-23 02:00:20 +07:00 · 2024-12-14 18:38:41 +01:00
parent b33b97802e 367789bda2
commit 149c9d12d3
34 changed files with 1052 additions and 218 deletions
@@ -49,12 +49,15 @@ PageType {
            }

            LabelWithImageType {
+                property bool showSubscriptionEndDate: ServersModel.getProcessedServerData("isCountrySelectionAvailable")
+
                Layout.fillWidth: true
                Layout.margins: 16

                imageSource: "qrc:/images/controls/history.svg"
-                leftText: qsTr("Work period")
-                rightText: ApiServicesModel.getSelectedServiceData("workPeriod")
+                leftText: showSubscriptionEndDate ? qsTr("Valid until") : qsTr("Work period")
+                rightText: showSubscriptionEndDate ? ApiServicesModel.getSelectedServiceData("endDate")
+                                                   : ApiServicesModel.getSelectedServiceData("workPeriod")

                visible: rightText !== ""
            }