Fix missing Pay now link

CRM/Admin/Form/SettingTrait.php

@@ -190,7 +190,7 @@ protected function addFieldsDefinedInSettingsMetadata() {
           $this->$add($setting, ts($props['title']), $options);
         }
         // Migrate to using an array as easier in smart...
-        $descriptions[$setting] = ts($props['description']);
+        $descriptions[$setting] = CRM_Utils_Array::value('description', $props);
         $this->assign("{$setting}_description", ts($props['description']));
         if ($setting == 'max_attachments') {
           //temp hack @todo fix to get from metadata

CRM/Contribute/Page/UserDashboard.php

@@ -139,10 +139,8 @@ public function listContribution() {
    * loads, it decides the which action has to be taken for the page.
    */
   public function run() {
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    $defaultInvoicePage = CRM_Utils_Array::value('default_invoice_page', $invoiceSettings);
     $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled());
-    $this->assign('defaultInvoicePage', $defaultInvoicePage);
+    $this->assign('defaultInvoicePage', CRM_Invoicing_Utils::getDefaultPaymentPage());
     parent::preProcess();
     $this->listContribution();
   }

CRM/Invoicing/Utils.php

@@ -66,7 +66,7 @@ public static function onToggle($oldValue, $newValue, $metadata) {
    * set within contribution_invoice_settings (which stores multiple settings
    * as an array in a non-standard way).
    *
-   * We check both here.
+   * We check both here. But will deprecate the latter in time.
    */
   public static function isInvoicingEnabled() {
     if (Civi::settings()->get('invoicing')) {
@@ -76,4 +76,21 @@ public static function isInvoicingEnabled() {
     return CRM_Utils_Array::value('invoicing', $invoiceSettings);
   }
 
+  /**
+   * Function to call to determine default invoice page.
+   *
+   * Historically the invoicing was declared as a setting but actually
+   * set within contribution_invoice_settings (which stores multiple settings
+   * as an array in a non-standard way).
+   *
+   * We check both here. But will deprecate the latter in time.
+   */
+  public static function getDefaultPaymentPage() {
+    if (($value = Civi::settings()->get('default_invoice_page') !== FALSE)) {
+      return $value;
+    }
+    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
+    return CRM_Utils_Array::value('default_invoice_page', $invoiceSettings);
+  }
+
 }