Merge branch 'hotfix' into develop

Author: jimyhuang

CRM/Contribute/Form/ContributionView.php

@@ -65,6 +65,9 @@ public function preProcess() {
     $instrument_options = CRM_Core_OptionGroup::values('payment_instrument', FALSE);
     $no_expire_date = array(ts('Convenient Store'), ts('Convenient Store code'), ts('ATM'));
     $instrument = $instrument_options[$values['payment_instrument_id']];
+    if ($instrument == ts('Check')) {
+      $this->assign('payment_instrument_name', 'Check');
+    }
     if($values['payment_instrument_id'] != 1 && $instrument != 'Web ATM'){
       $this->assign('has_expire_date', TRUE);
       $this->assign('expire_date', $values['expire_date']);

js/contribution_page.d9.js

@@ -279,6 +279,19 @@
         $('.contrib-step-'+exec_step)
           .append(this.createStepBtnBlock(['last-step']).addClass('hide-as-show-all').addClass('crm-section'))
           .append($('.crm-submit-buttons'));
+
+        const $recaptchaSection = $('.crm-section.recaptcha-section');
+        if ($recaptchaSection.length) {
+          const $submitContainer = $('.crm-container .contrib-step:has(.crm-submit-buttons)');
+          const $actionWrapper = $submitContainer.find('.step-action-wrapper');
+
+          if ($actionWrapper.length) {
+            $actionWrapper.before($recaptchaSection);
+          } else {
+            $submitContainer.before($recaptchaSection);
+          }
+        }
+
         $('.crm-contribution-main-form-block').hide();
 
         if($("#billing-payment-block").length == 0){

js/contribution_page.js

@@ -281,6 +281,19 @@
         $('.contrib-step-'+exec_step)
           .append(this.createStepBtnBlock(['last-step']).addClass('hide-as-show-all').addClass('crm-section'))
           .append($('.crm-submit-buttons'));
+
+        const $recaptchaSection = $('.crm-section.recaptcha-section');
+        if ($recaptchaSection.length) {
+          const $submitContainer = $('.crm-container .contrib-step:has(.crm-submit-buttons)');
+          const $actionWrapper = $submitContainer.find('.step-action-wrapper');
+
+          if ($actionWrapper.length) {
+            $actionWrapper.before($recaptchaSection);
+          } else {
+            $submitContainer.before($recaptchaSection);
+          }
+        }
+
         $('.crm-contribution-main-form-block').hide();
 
         if($("#billing-payment-block").length == 0){

l10n/pot/civicrm.pot

@@ -49699,6 +49699,18 @@ msgstr ""
 msgid "Please enter a default name for anonymous donors."
 msgstr ""
 
+#: CRM/Core/SelectValues.php
+msgid "Do not notify"
+msgstr ""
+
+#: templates/CRM/Contribute/Form/Contribution.tpl
+msgid "Contact labelled as do not notification."
+msgstr ""
+
+#: CRM/Event/BAO/Event.php
+msgid "Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present."
+msgstr ""
+
 #: templates/CRM/Admin/Form/Setting/Receipt.tpl
 msgid "Please upload the logo image to be displayed on the receipt."
 msgstr ""

l10n/zh_TW/LC_MESSAGES/civicrm.mo

@@ -8,7 +8,7 @@
 # Harry Lin <[email protected]>, 2023
 # IreneLin, 2013
 # IreneLin, 2013
-# jimyhuang <[email protected]>, 2013,2015-2024
+# jimyhuang <[email protected]>, 2013,2015-2025
 # Chang Shu-huai <[email protected]>, 2015-2016
 # peggy chiu, 2024
 # Seal Shen, 2025
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: netiCRM\n"
 "PO-Revision-Date: 2013-07-25 09:19+0000\n"
-"Last-Translator: 馮 佳今, 2022-2025\n"
+"Last-Translator: jimyhuang <[email protected]>, 2013,2015-2025\n"
 "Language-Team: Chinese (Taiwan) (http://app.transifex.com/netivism-tw/neticrm/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50272,6 +50272,20 @@ msgstr "可自訂一個預設名稱，如「善心人士」、「OO之友」等
 msgid "Please enter a default name for anonymous donors."
 msgstr "請輸入匿名捐款人的預設名稱。"
 
+#: CRM/Core/SelectValues.php
+msgid "Do not notify"
+msgstr "不要收到系統流程信件"
+
+#: templates/CRM/Contribute/Form/Contribution.tpl
+msgid "Contact labelled as do not notification."
+msgstr "聯絡人標示為不要收到系統流程信件"
+
+#: CRM/Event/BAO/Event.php
+msgid ""
+"Email has NOT been sent to %1 contact(s) - communication preferences specify"
+" DO NOT NOTIFY OR valid Email is NOT present."
+msgstr "Email 無法寄送給 %1 位聯絡人，因為聯絡人的偏好選項設定為「不要收到系統流程信件」、或是未設定有效的 Email。"
+
 #: templates/CRM/Admin/Form/Setting/Receipt.tpl
 msgid "Please upload the logo image to be displayed on the receipt."
 msgstr "請上傳將顯示在收據上的 Logo 圖片。"

l10n/zh_TW/civicrm.po

@@ -205,8 +205,7 @@
       </td>
   </tr>
   {/if}
-  {$payment_instrument}
-	{if $payment_instrument_id eq '4'} // If payment_instrument is check
+	{if $payment_instrument_name eq 'Check'}
         <tr>
             <td class="label">{ts}Check Number{/ts}</td>
             <td>{$check_number}</td>