Switch to year/month params as credit_card_exp_date can be inconsistent

Author: mattwire

CRM/Core/Payment/OmnipayMultiProcessor.php

@@ -588,8 +588,8 @@ private function getSensitiveCreditCardObjectOptions($params) {
       $cardFields[$cardField] = isset($params[$civicrmField]) ? $params[$civicrmField] : '';
     }
     if (!empty($params['credit_card_exp_date'])) {
-      $cardFields['expiryMonth'] = $params['credit_card_exp_date']['M'];
-      $cardFields['expiryYear'] = $params['credit_card_exp_date']['Y'];
+      $cardFields['expiryMonth'] = $params['month'];
+      $cardFields['expiryYear'] = $params['year'];
     }
     return $cardFields;
   }
@@ -1530,10 +1530,10 @@ protected function doPreApproveForRecurring($params) {
    * @return false|string
    */
   protected function getCreditCardExpiry($params) {
-    if (empty($params['credit_card_exp_date'])) {
+    if (empty($params['year']) || empty($params['month'])) {
       return FALSE;
     }
-    return date("Y-m-t", strtotime($params['credit_card_exp_date']['Y'] . '-' . $params['credit_card_exp_date']['M']));
+    return date("Y-m-t", strtotime($params['year'] . '-' . $params['month']));
   }
 
   /**