Avoid harcoded link

MerginMaps · Nov 19, 2024 · 53d3594 · 53d3594
1 parent 684114c
commit 53d3594
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/app/inputhelp.cpp b/app/inputhelp.cpp
@@ -116,6 +116,11 @@ QString InputHelp::merginSubscriptionLink() const
   }
 }
 
+QString InputHelp::merginPricingLink() const
+{
+  return inputWeb + "/pricing/" + utmTagSubscription;
+}
+
 QString InputHelp::privacyPolicyLink() const
 {
   return inputWeb + "/privacy-policy" + utmTagOther;

diff --git a/app/inputhelp.h b/app/inputhelp.h
@@ -29,6 +29,7 @@ class InputHelp: public QObject
     Q_PROPERTY( QString merginWebLink READ merginWebLink NOTIFY merginLinkChanged )
     Q_PROPERTY( QString merginDashboardLink READ merginDashboardLink NOTIFY merginLinkChanged )
     Q_PROPERTY( QString merginSubscriptionLink READ merginSubscriptionLink NOTIFY merginLinkChanged )
+    Q_PROPERTY( QString merginPricingLink READ merginPricingLink NOTIFY merginLinkChanged )
     Q_PROPERTY( QString merginSubscriptionDetailsLink READ merginSubscriptionDetailsLink NOTIFY linkChanged )
     Q_PROPERTY( QString howToEnableDigitizingLink READ howToEnableDigitizingLink NOTIFY linkChanged )
     Q_PROPERTY( QString howToEnableBrowsingDataLink READ howToEnableBrowsingDataLink NOTIFY linkChanged )
@@ -63,6 +64,7 @@ class InputHelp: public QObject
     QString merginWebLink() const;
     QString merginDashboardLink() const;
     QString merginSubscriptionLink() const;
+    QString merginPricingLink() const;
     QString privacyPolicyLink() const;
     QString merginSubscriptionDetailsLink() const;
     QString howToEnableDigitizingLink() const;

diff --git a/app/ios/iosviewdelegate.h b/app/ios/iosviewdelegate.h
@@ -23,9 +23,9 @@
  * View controller for iOSImagePicker
 */
 @interface IOSViewDelegate : NSObject<UIImagePickerControllerDelegate,
-UINavigationControllerDelegate>
+  UINavigationControllerDelegate>
 {
-  @public
+@public
 
   IOSImagePicker *handler;
   BOOL processingPicture;

diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -725,7 +725,7 @@ ApplicationWindow {
         Qt.openUrlExternally(__inputHelp.merginSubscriptionLink)
       }
       else {
-        Qt.openUrlExternally("https://www.merginmaps.com/pricing")
+        Qt.openUrlExternally(__inputHelp.merginPricingLink)
       }
     }
   }

diff --git a/app/test/testlinks.h b/app/test/testlinks.h
@@ -94,6 +94,11 @@ class TestLinks: public QObject
       _run( mHelp.merginSubscriptionLink() );
     }
 
+    void testMerginPricingLink()
+    {
+      _run( mHelp.merginPricingLink() );
+    }
+
     void testMerginSubscriptionDetailsLink()
     {
       _run( mHelp.merginSubscriptionDetailsLink() );
-Original file line number
+Diff line change
@@ Expand Up / @@ -725,7 +725,7 @@ ApplicationWindow { @@
             Qt.openUrlExternally(__inputHelp.merginSubscriptionLink)
           }
           else {
-            Qt.openUrlExternally("https://www.merginmaps.com/pricing")
+            Qt.openUrlExternally(__inputHelp.merginPricingLink)
           }
         }
       }
@@ Expand Down @@