Improve form redirect on empty post

Author: eileenmcnaughton

CRM/Core/Page/PaymentPage.php

@@ -17,7 +17,6 @@ class CRM_Core_Page_PaymentPage extends CRM_Core_Page {
    * @throws \CiviCRM_API3_Exception
    */
   public function run() {
-    CRM_Utils_System::setTitle(ts('Enter your payment details'));
     $formData = $this->getTransparentRedirectFormData(CRM_Utils_Request::retrieve('key', 'String', CRM_Core_DAO::$_nullObject, TRUE));
     $paymentProcessorID = $formData['payment_processor_id'];
     $paymentProcessor = civicrm_api3('payment_processor', 'getsingle', array('id' => $paymentProcessorID));
@@ -30,6 +29,9 @@ public function run() {
         $displayFields[$fieldName]['options']['year'] = $this->getDateFieldsYearOptions($displayField);
       }
     }
+    if (!empty($displayFields)) {
+      CRM_Utils_System::setTitle(ts('Enter your payment details'));
+    }
     $this->assign('hidden_fields', array_diff_key($formData, $displayFields));
     $this->assign('display_fields', $displayFields);
     $this->assign('post_url', $formData['post_submit_url']);

templates/CRM/Core/Page/PaymentPage.tpl

@@ -1,4 +1,4 @@
-<form action="{$post_url}" method="post">
+<form action="{$post_url}" method="post" id="payment-redirect">
   {foreach from=$hidden_fields key=hidden_field item=hidden_field_input}
     <input name="{$hidden_field}" value="{$hidden_field_input}" type="hidden"/>
   {/foreach}
@@ -63,8 +63,13 @@
       <div class="clear"></div>
     </div>
   {/foreach}
+  {if empty($display_fields)}<p>{ts}Please Click the pay now button if you are not automatically redirected{/ts}</p>{/if}
 
-  <input class='form-submit default crm-form-submit' type="submit" value="{ts}Submit{/ts}">
+  <input class='form-submit default crm-form-submit' type="submit" value="{ts}Pay now{/ts}">
 
 </form>
 
+<script type="text/javascript">
+  document.getElementById("payment-redirect").submit();
+</script>
+