From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 19 Dec 2023 05:21:42 +0000 (+1300)
Subject: Merge branch '5.69' of github.com:civicrm/civicrm-core
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=38e00aa8e437f98bf615e4af4bce39c5e7f69707;p=civicrm-core.git

Merge branch '5.69' of github.com:civicrm/civicrm-core
---

38e00aa8e437f98bf615e4af4bce39c5e7f69707
diff --cc CRM/Financial/BAO/Order.php
index 8fd948e8ee,ec85b13fec..36529e0f68
--- a/CRM/Financial/BAO/Order.php
+++ b/CRM/Financial/BAO/Order.php
@@@ -954,9 -954,10 +954,10 @@@ class CRM_Financial_BAO_Order 
        elseif ($taxRate) {
          $lineItem['tax_amount'] = ($taxRate / 100) * $lineItem['line_total'];
        }
 -      $lineItem['membership_type_id'] = $lineItem['membership_type_id'] ?? NULL;
 +      $lineItem['membership_type_id'] ??= NULL;
        if ($lineItem['membership_type_id']) {
          $lineItem['entity_table'] = 'civicrm_membership';
+         $lineItem['membership_num_terms'] = $lineItem['membership_num_terms'] ?:1;
        }
        $lineItem['title'] = $this->getLineItemTitle($lineItem);
        $lineItem['tax_rate'] = $taxRate = $this->getTaxRate((int) $lineItem['financial_type_id']);