Merge pull request #10823 from mattwire/CRM-21031_financialtypedisplay

[civicrm-core.git] / CRM / Price / Page / Option.php

diff --git a/CRM/Price/Page/Option.php b/CRM/Price/Page/Option.php
index 4de80abcfd129b3cc1829185c78e0b873ef23340..6b48ca88dd3dcac2faa330daa704bef9f232d784 100644 (file)
--- a/CRM/Price/Page/Option.php
+++ b/CRM/Price/Page/Option.php
@@ -128,6 +128,7 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
         'check_permissions' => FALSE,
         'options' => array(
           'limit' => 0,
+          'sort' => array('weight', 'label'),
         ),
     ));
     $customOption = $priceOptions['values'];
@@ -159,8 +160,8 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
         $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($customOption[$id]['amount'], $customOption[$id]['tax_rate']);
         $customOption[$id]['tax_amount'] = $taxAmount['tax_amount'];
       }
-      if (!empty($values['financial_type_id']) && !empty($financialType[$values['financial_type_id']])) {
-        $customOption[$id]['financial_type_id'] = $financialType[$values['financial_type_id']];
+      if (!empty($values['financial_type_id'])) {
+        $customOption[$id]['financial_type_id'] = CRM_Contribute_PseudoConstant::financialType($values['financial_type_id']);
       }
       // update enable/disable links depending on price_field properties.
       if ($this->_isSetReserved) {