diff --git a/CRM/Member/Form.php b/CRM/Member/Form.php index c1003f622694..d0c54dc79fdc 100644 --- a/CRM/Member/Form.php +++ b/CRM/Member/Form.php @@ -500,10 +500,15 @@ protected function setPriceSetParameters(array $formValues): array { $this->order = new CRM_Financial_BAO_Order(); $this->order->setForm($this); $this->order->setPriceSelectionFromUnfilteredInput($formValues); + if (isset($formValues['total_amount'])) { $this->order->setOverrideTotalAmount((float) $formValues['total_amount']); } - $this->order->setOverrideFinancialTypeID((int) $formValues['financial_type_id']); + + if (empty($formValues['price_set_id'])) { + $this->order->setOverrideFinancialTypeID((int) $formValues['financial_type_id']); + } + return $formValues; }