X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FPayment%2FeWAY.php;h=71457de839318fb0df9410358449dafe609165bd;hb=a922142c067998cb0ffb4cbc95a71aa370ffdc88;hp=f8ecb80018a2e60f7f4a282577581eda261ffa4f;hpb=7c60edb1bf1ca31accfafd35ef0ae02409615e7c;p=civicrm-core.git diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index f8ecb80018..71457de839 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -1,7 +1,7 @@ _processorName = ts('eWay'); } - /** - * singleton function used to manage this object - * - * @param string $mode the mode of operation: live or test - * - * @param object $paymentProcessor - * @param null $paymentForm - * @param bool $force - * - * @return object - * @static - */ - static function &singleton($mode, &$paymentProcessor, &$paymentForm = NULL, $force = false) { - $processorName = $paymentProcessor['name']; - if (self::$_singleton[$processorName] === NULL) { - self::$_singleton[$processorName] = new CRM_Core_Payment_eWAY($mode, $paymentProcessor); - } - return self::$_singleton[$processorName]; - } - /********************************************************** * This function sends request and receives response from * eWAY payment process **********************************************************/ - function doDirectPayment(&$params) { + public function doDirectPayment(&$params) { if (CRM_Utils_Array::value('is_recur', $params) == TRUE) { CRM_Core_Error::fatal(ts('eWAY - recurring payments not implemented')); } @@ -185,12 +166,11 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { $country = $params['country']; */ - //------------------------------------------------------------- // Prepare some composite data from _paymentProcessor fields //------------------------------------------------------------- $fullAddress = $params['street_address'] . ", " . $params['city'] . ", " . $params['state_province'] . "."; - $expireYear = substr($params['year'], 2, 2); + $expireYear = substr($params['year'], 2, 2); $expireMonth = sprintf('%02d', (int) $params['month']); // CiviCRM V1.9 - Picks up reasonable description //$description = $params['amount_level']; @@ -316,12 +296,14 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { $errorDesc = curl_error($submit); // Paranoia - in the unlikley event that 'curl' errno fails - if ($errorNum == 0) - $errorNum = 9005; + if ($errorNum == 0) { + $errorNum = 9005; + } // Paranoia - in the unlikley event that 'curl' error fails - if (strlen($errorDesc) == 0) - $errorDesc = "Connection to eWAY payment gateway failed"; + if (strlen($errorDesc) == 0) { + $errorDesc = "Connection to eWAY payment gateway failed"; + } return self::errorExit($errorNum, $errorDesc); } @@ -403,12 +385,12 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { $trxn_id = str_replace( 'test', '', $trxn_id ); $trxn_id = intval($trxn_id) + 1; $params['trxn_id'] = sprintf('test%08d', $trxn_id); - } else { + } + else { $params['trxn_id'] = $eWAYResponse->TransactionNumber(); } */ - //============= // Success ! //============= @@ -427,11 +409,13 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { /** * Checks to see if invoice_id already exists in db * - * @param int $invoiceId The ID to check + * @param int $invoiceId + * The ID to check. * - * @return bool True if ID exists, else false + * @return bool + * True if ID exists, else false */ - function _checkDupe($invoiceId) { + public function _checkDupe($invoiceId) { $contribution = new CRM_Contribute_DAO_Contribution(); $contribution->invoice_id = $invoiceId; return $contribution->find(); @@ -440,7 +424,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { /************************************************************************************************* * This function checks the eWAY response status - returning a boolean false if status != 'true' *************************************************************************************************/ - function isError(&$response) { + public function isError(&$response) { $status = $response->Status(); if ((stripos($status, "true")) === FALSE) { @@ -452,7 +436,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { /************************************************** * Produces error message and returns from class **************************************************/ - function &errorExit($errorCode = NULL, $errorMessage = NULL) { + public function &errorExit($errorCode = NULL, $errorMessage = NULL) { $e = CRM_Core_Error::singleton(); if ($errorCode) { @@ -467,7 +451,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { /************************************************** * NOTE: 'doTransferCheckout' not implemented **************************************************/ - function doTransferCheckout(&$params, $component) { + public function doTransferCheckout(&$params, $component) { CRM_Core_Error::fatal(ts('This function is not implemented')); } @@ -488,7 +472,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { */ //function checkConfig( $mode ) // CiviCRM V1.9 Declaration // CiviCRM V2.0 Declaration - function checkConfig() { + public function checkConfig() { $errorMsg = array(); if (empty($this->_paymentProcessor['user_name'])) { @@ -514,11 +498,10 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { * @param $p_request * @param $p_response */ - function send_alert_email($p_eWAY_tran_num, $p_trxn_out, $p_trxn_back, $p_request, $p_response) { + public function send_alert_email($p_eWAY_tran_num, $p_trxn_out, $p_trxn_back, $p_request, $p_response) { // Initialization call is required to use CiviCRM APIs. civicrm_initialize(TRUE); - list($fromName, $fromEmail) = CRM_Core_BAO_Domain::getNameAndEmail(); $from = "$fromName <$fromEmail>"; @@ -556,15 +539,14 @@ The CiviCRM eWAY Payment Processor Module $params = array(); $params['groupName'] = 'eWay Email Sender'; - $params['from'] = $from; - $params['toName'] = $toName; - $params['toEmail'] = $toEmail; - $params['subject'] = $subject; - $params['cc'] = $cc; - $params['text'] = $message; + $params['from'] = $from; + $params['toName'] = $toName; + $params['toEmail'] = $toEmail; + $params['subject'] = $subject; + $params['cc'] = $cc; + $params['text'] = $message; CRM_Utils_Mail::send($params); } } // end class CRM_Core_Payment_eWAY -