X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FPayment%2FPayPalImpl.php;h=838542d15f6f40402bbb3508c74fac7927284e86;hb=ee9c028679b097f6f7e92f367a6cb8da3fd54037;hp=efe8fdfe4d531a6de9ddcb9f25c29a52512bb99e;hpb=6fd0519667b8c37759460c6c1516a22210418aa5;p=civicrm-core.git diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index efe8fdfe4d..838542d15f 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -197,6 +197,9 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { $args['cancelURL'] = CRM_Utils_Array::value('cancelURL', $params); $args['desc'] = $params['description']; + // add CiviCRM BN code + $args['BUTTONSOURCE'] = 'CiviCRM_SP'; + $result = $this->invokeAPI($args); if (is_a($result, 'CRM_Core_Error')) { @@ -255,6 +258,9 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { "&b={$params['contributionID']}" . "&p={$params['contributionPageID']}"; + // add CiviCRM BN code + $args['BUTTONSOURCE'] = 'CiviCRM_SP'; + $result = $this->invokeAPI($args); if (is_a($result, 'CRM_Core_Error')) { @@ -262,7 +268,6 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { } /* Success */ - $params['trxn_id'] = $result['transactionid']; $params['gross_amount'] = $result['amt']; $params['fee_amount'] = $result['feeamt']; @@ -325,6 +330,9 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { $args['desc'] = substr(CRM_Utils_Array::value('description', $params), 0, 127); $args['custom'] = CRM_Utils_Array::value('accountingCode', $params); + // add CiviCRM BN code + $args['BUTTONSOURCE'] = 'CiviCRM_SP'; + if (CRM_Utils_Array::value('is_recur', $params) == 1) { $start_time = strtotime(date('m/d/Y')); $start_date = date('Y-m-d\T00:00:00\Z', $start_time); @@ -600,9 +608,8 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { 'invoice' => $params['invoiceID'], 'lc' => substr($config->lcMessages, -2), 'charset' => function_exists('mb_internal_encoding') ? mb_internal_encoding() : 'UTF-8', - 'custom' => CRM_Utils_Array::value('accountingCode', - $params - ), + 'custom' => CRM_Utils_Array::value('accountingCode', $params), + 'bn' => 'CiviCRM_SP', ); // add name and address if available, CRM-3130