Merge pull request civicrm#11329 from eileenmcnaughton/currency

Currency
ixiam · Jan 10, 2018 · e502b42 · e502b42
2 parents 3fc6498 + ba7fe30
commit e502b42
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -2360,4 +2360,25 @@ public function assignBillingName($params = array()) {
     return $name;
   }
 
+  /**
+   * Get the currency for the form.
+   *
+   * @todo this should be overriden on the forms rather than having this
+   * historic, possible handling in here. As we clean that up we should
+   * add deprecation notices into here.
+   */
+  public function getCurrency() {
+    $currency = CRM_Utils_Array::value('currency', $this->_values);
+    // For event forms, currency is in a different spot
+    if (empty($currency)) {
+      $currency = CRM_Utils_Array::value('currency', CRM_Utils_Array::value('event', $this->_values));
+    }
+    if (empty($currency)) {
+      $currency = CRM_Utils_Request::retrieveValue('currency', 'String');
+    }
+    // @todo If empty there is a problem - we should probably put in a deprecation notice
+    // to warn if that seems to be happening.
+    return $currency;
+  }
+
 }
diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
@@ -985,6 +985,19 @@ protected function getBaseReturnUrl() {
     return $baseURL;
   }
 
+  /**
+   * Get the currency for the transaction.
+   *
+   * Handle any inconsistency about how it is passed in here.
+   *
+   * @param $params
+   *
+   * @return string
+   */
+  protected function getCurrency($params) {
+    return CRM_Utils_Array::value('currencyID', $params, CRM_Utils_Array::value('currency', $params));
+  }
+
   /**
    * Get url to return to after cancelled or failed transaction.
    *

diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php
@@ -477,7 +477,7 @@ public function doDirectPayment(&$params, $component = 'contribute') {
 
     $args['paymentAction'] = 'Sale';
     $args['amt'] = $params['amount'];
-    $args['currencyCode'] = $params['currencyID'];
+    $args['currencyCode'] = $this->getCurrency($params);
     $args['invnum'] = $params['invoiceID'];
     $args['ipaddress'] = $params['ip_address'];
     $args['creditCardType'] = $params['credit_card_type'];

diff --git a/CRM/Core/Payment/ProcessorForm.php b/CRM/Core/Payment/ProcessorForm.php
@@ -72,11 +72,7 @@ public static function preProcess(&$form, $type = NULL, $mode = NULL) {
 
     $form->assign('suppressSubmitButton', $form->_paymentObject->isSuppressSubmitButtons());
 
-    $currency = CRM_Utils_Array::value('currency', $form->_values);
-    // For event forms, currency is in a different spot
-    if (empty($currency)) {
-      $currency = CRM_Utils_Array::value('currency', $form->_values['event']);
-    }
+    $currency = $form->getCurrency();
     $form->assign('currency', $currency);
 
     // also set cancel subscription url