diff --git a/CRM/Core/Payment/Stripe.php b/CRM/Core/Payment/Stripe.php
index 8d23a316b4d63f076e9680f5e12a8ddf727e879b..ff133c2d31992555a10a7427fa76e4b758f9956c 100644
--- a/CRM/Core/Payment/Stripe.php
+++ b/CRM/Core/Payment/Stripe.php
@@ -21,6 +21,13 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
*/
protected $_mode = NULL;
+ /**
+ * TRUE if we are dealing with a live transaction
+ *
+ * @var boolean
+ */
+ private $_islive = FALSE;
+
/**
* Constructor
*
@@ -61,6 +68,22 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
}
}
+ /**
+ * Get the currency for the transaction.
+ *
+ * Handle any inconsistency about how it is passed in here.
+ *
+ * @param $params
+ *
+ * @return string
+ */
+ public function getAmount($params) {
+ // Stripe amount required in cents.
+ $amount = number_format($params['amount'], 2, '.', '');
+ $amount = (int) preg_replace('/[^\d]/', '', strval($amount));
+ return $amount;
+ }
+
/**
* Helper log function.
*
@@ -70,25 +93,47 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
* The error!
*/
public function logStripeException($op, $exception) {
- $body = print_r($exception->getJsonBody(), TRUE);
- Civi::log()->debug("Stripe_Error {$op}: <pre> {$body} </pre>");
+ Civi::log()->debug("Stripe_Error {$op}: " . print_r($exception->getJsonBody(), TRUE));
}
/**
* Check if return from stripeCatchErrors was an error object
* that should be passed back to original api caller.
*
- * @param $stripeReturn
+ * @param array $err
* The return from a call to stripeCatchErrors
*
* @return bool
- *
*/
- public function isErrorReturn($stripeReturn) {
- if (is_object($stripeReturn) && get_class($stripeReturn) == 'CRM_Core_Error') {
+ public function isErrorReturn($err) {
+ if (!empty($err['is_error'])) {
return TRUE;
}
- return FALSE;
+ else {
+ return FALSE;
+ }
+ }
+
+ /**
+ * Handle an error from Stripe API and notify the user
+ *
+ * @param array $err
+ * @param string $bounceURL
+ *
+ * @return string errorMessage (or statusbounce if URL is specified)
+ */
+ public function handleErrorNotification($err, $bounceURL = NULL) {
+ $errorMessage = 'Payment Response: <br />' .
+ 'Type: ' . $err['type'] . '<br />' .
+ 'Code: ' . $err['code'] . '<br />' .
+ 'Message: ' . $err['message'] . '<br />';
+
+ Civi::log()->debug('Stripe Payment Error: ' . $errorMessage);
+
+ if ($bounceURL) {
+ CRM_Core_Error::statusBounce($errorMessage, $bounceURL, 'Payment Error');
+ }
+ return $errorMessage;
}
/**
@@ -107,7 +152,6 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
* @throws \CiviCRM_API3_Exception
*/
public function stripeCatchErrors($op = 'create_customer', $stripe_params, $params, $ignores = array()) {
- $error_url = $params['stripe_error_url'];
$return = FALSE;
// Check for errors before trying to submit.
try {
@@ -159,23 +203,17 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
}
$this->logStripeException($op, $e);
- $error_message = '';
// Since it's a decline, Stripe_CardError will be caught
$body = $e->getJsonBody();
$err = $body['error'];
if (!isset($err['code'])) {
- $err['code'] = null;
+ // A "fake" error code
+ $err['code'] = 9000;
}
- //$error_message .= 'Status is: ' . $e->getHttpStatus() . "<br />";
- ////$error_message .= 'Param is: ' . $err['param'] . "<br />";
- $error_message .= 'Type: ' . $err['type'] . '<br />';
- $error_message .= 'Code: ' . $err['code'] . '<br />';
- $error_message .= 'Message: ' . $err['message'] . '<br />';
if (is_a($e, 'Stripe_CardError')) {
- $newnote = civicrm_api3('Note', 'create', array(
- 'sequential' => 1,
- 'entity_id' => $params['contactID'],
+ civicrm_api3('Note', 'create', array(
+ 'entity_id' => self::getContactId($params),
'contact_id' => $params['contributionID'],
'subject' => $err['type'],
'note' => $err['code'],
@@ -183,23 +221,9 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
));
}
- if (isset($error_url)) {
- // Redirect to first page of form and present error.
- CRM_Core_Error::statusBounce("Oops! Looks like there was an error. Payment Response:
- <br /> {$error_message}", $error_url);
- }
- else {
- // Don't have return url - return error object to api
- $core_err = CRM_Core_Error::singleton();
- $message = 'Oops! Looks like there was an error. Payment Response: <br />' . $error_message;
- if ($err['code']) {
- $core_err->push($err['code'], 0, NULL, $message);
- }
- else {
- $core_err->push(9000, 0, NULL, 'Unknown Error: ' . $message);
- }
- return $core_err;
- }
+ // Flag to detect error return
+ $err['is_error'] = TRUE;
+ return $err;
}
return $return;
@@ -399,13 +423,13 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
if (!(array_key_exists('qfKey', $params))) {
// Probably not called from a civicrm form (e.g. webform) -
// will return error object to original api caller.
- $params['stripe_error_url'] = $error_url = null;
+ $params['stripe_error_url'] = NULL;
}
else {
$qfKey = $params['qfKey'];
$parsed_url = parse_url($params['entryURL']);
$url_path = substr($parsed_url['path'], 1);
- $params['stripe_error_url'] = $error_url = CRM_Utils_System::url($url_path,
+ $params['stripe_error_url'] = CRM_Utils_System::url($url_path,
$parsed_url['query'] . "&_qf_Main_display=1&qfKey={$qfKey}", FALSE, NULL, FALSE);
}
@@ -413,9 +437,7 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
\Stripe\Stripe::setAppInfo('CiviCRM', CRM_Utils_System::version(), CRM_Utils_System::baseURL());
\Stripe\Stripe::setApiKey($this->_paymentProcessor['user_name']);
- // Stripe amount required in cents.
- $amount = number_format($params['amount'], 2, '.', '');
- $amount = (int) preg_replace('/[^\d]/', '', strval($amount));
+ $amount = self::getAmount($params);
// Use Stripe.js instead of raw card details.
if (!empty($params['stripe_token'])) {
@@ -429,186 +451,64 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
Civi::log()->debug('Stripe.js token was not passed! Report this message to the site administrator. $params: ' . print_r($params, TRUE));
}
- // Check for existing customer, create new otherwise.
- // Possible email fields.
- $email_fields = array(
- 'email',
- 'email-5',
- 'email-Primary',
- );
-
- // Possible contact ID fields.
- $contact_id_fields = array(
- 'contact_id',
- 'contactID',
- );
-
- // Find out which email field has our yummy value.
- foreach ($email_fields as $email_field) {
- if (!empty($params[$email_field])) {
- $email = $params[$email_field];
- break;
- }
- }
-
- // We didn't find an email, but never fear - this might be a backend contrib.
- // We can look for a contact ID field and get the email address.
- if (empty($email)) {
- foreach ($contact_id_fields as $cid_field) {
- if (!empty($params[$cid_field])) {
- $email = civicrm_api3('Contact', 'getvalue', array(
- 'id' => $params[$cid_field],
- 'return' => 'email',
- ));
- break;
- }
- }
- }
+ $contactId = self::getContactId($params);
+ $email = self::getBillingEmail($params, $contactId);
- // We still didn't get an email address?! /ragemode on
- if (empty($email)) {
- CRM_Core_Error::fatal(ts('No email address found. Please report this issue.'));
- }
-
- // Prepare escaped query params.
- $query_params = array(
- 1 => array($email, 'String'),
- 2 => array($this->_paymentProcessor['id'], 'Integer'),
- );
-
- $customer_query = CRM_Core_DAO::singleValueQuery("SELECT id
- FROM civicrm_stripe_customers
- WHERE email = %1 AND is_live = '{$this->_islive}' AND processor_id = %2", $query_params);
-
- /****
- * If for some reason you cannot use Stripe.js and you are aware of PCI Compliance issues,
- * here is the alternative to Stripe.js:
- ****/
-
- /*
- // Get Cardholder's full name.
- $cc_name = $params['first_name'] . " ";
- if (strlen($params['middle_name']) > 0) {
- $cc_name .= $params['middle_name'] . " ";
- }
- $cc_name .= $params['last_name'];
-
- // Prepare Card details in advance to use for new Stripe Customer object if we need.
- $card_details = array(
- 'number' => $params['credit_card_number'],
- 'exp_month' => $params['month'],
- 'exp_year' => $params['year'],
- 'cvc' => $params['cvv2'],
- 'name' => $cc_name,
- 'address_line1' => $params['street_address'],
- 'address_state' => $params['state_province'],
- 'address_zip' => $params['postal_code'],
- );
- */
-
- // drastik - Uncomment this for Drupal debugging to dblog.
- /*
- $zz = print_r(get_defined_vars(), TRUE);
- $debug_code = '<pre>' . $zz . '</pre>';
- watchdog('Stripe', $debug_code);
- */
-
- // Customer not in civicrm_stripe database. Create a new Customer in Stripe.
- if (!isset($customer_query)) {
- $sc_create_params = array(
- 'description' => 'Donor from CiviCRM',
- 'card' => $card_token,
- 'email' => $email,
- );
+ // See if we already have a stripe customer
+ $customerParams = [
+ 'contact_id' => $contactId,
+ 'card_token' => $card_token,
+ 'is_live' => $this->_islive,
+ 'processor_id' => $this->_paymentProcessor['id'],
+ 'email' => $email,
+ ];
- $stripe_customer = $this->stripeCatchErrors('create_customer', $sc_create_params, $params);
+ $stripeCustomerId = CRM_Stripe_Customer::find($customerParams);
- // Store the relationship between CiviCRM's email address for the Contact & Stripe's Customer ID.
- if (isset($stripe_customer)) {
- if ($this->isErrorReturn($stripe_customer)) {
- return $stripe_customer;
- }
- // Prepare escaped query params.
- $query_params = array(
- 1 => array($email, 'String'),
- 2 => array($stripe_customer->id, 'String'),
- 3 => array($this->_paymentProcessor['id'], 'Integer'),
- );
-
- CRM_Core_DAO::executeQuery("INSERT INTO civicrm_stripe_customers
- (email, id, is_live, processor_id) VALUES (%1, %2, '{$this->_islive}', %3)", $query_params);
- }
- else {
- CRM_Core_Error::fatal(ts('There was an error saving new customer within Stripe. Is Stripe down?'));
- }
+ // Customer not in civicrm database. Create a new Customer in Stripe.
+ if (!isset($stripeCustomerId)) {
+ $stripeCustomer = CRM_Stripe_Customer::create($customerParams, $this);
}
else {
- // Customer was found in civicrm_stripe database, fetch from Stripe.
- $stripe_customer = $this->stripeCatchErrors('retrieve_customer', $customer_query, $params);
- if (!empty($stripe_customer)) {
- if ($this->isErrorReturn($stripe_customer)) {
- return $stripe_customer;
- }
- // Avoid the 'use same token twice' issue while still using latest card.
- if (!empty($params['is_secondary_financial_transaction'])) {
- // This is a Contribution page with "Separate Membership Payment".
- // Charge is coming through for the 2nd time.
- // Don't update customer again or we will get "token_already_used" error from Stripe.
+ // Customer was found in civicrm database, fetch from Stripe.
+ $stripeCustomer = $this->stripeCatchErrors('retrieve_customer', $stripeCustomerId, $params);
+ if (!empty($stripeCustomer)) {
+ if ($this->isErrorReturn($stripeCustomer)) {
+ if (($stripeCustomer['type'] == 'invalid_request_error') && ($stripeCustomer['code'] == 'resource_missing')) {
+ // Customer doesn't exist, create a new one
+ CRM_Stripe_Customer::delete($customerParams);
+ $stripeCustomer = CRM_Stripe_Customer::create($customerParams, $this);
+ }
+ if ($this->isErrorReturn($stripeCustomer)) {
+ // We still failed to create a customer
+ self::handleErrorNotification($stripeCustomer, $params['stripe_error_url']);
+ return $stripeCustomer;
+ }
}
- else {
- $stripe_customer->card = $card_token;
- $response = $this->stripeCatchErrors('save', $stripe_customer, $params);
- if (isset($response) && $this->isErrorReturn($response)) {
- return $response;
- }
+
+ $stripeCustomer->card = $card_token;
+ $updatedStripeCustomer = $this->stripeCatchErrors('save', $stripeCustomer, $params);
+ if ($this->isErrorReturn($updatedStripeCustomer)) {
+ if (($updatedStripeCustomer['type'] == 'invalid_request_error') && ($updatedStripeCustomer['code'] == 'token_already_used')) {
+ // This error is ok, we've already used the token during create_customer
+ }
+ else {
+ self::handleErrorNotification($updatedStripeCustomer, $params['stripe_error_url']);
+ return $updatedStripeCustomer;
+ }
}
}
else {
- // Customer was found in civicrm_stripe database, but unable to be
- // retrieved from Stripe. Was he deleted?
- $sc_create_params = array(
- 'description' => 'Donor from CiviCRM',
- 'card' => $card_token,
- 'email' => $email,
- );
-
- $stripe_customer = $this->stripeCatchErrors('create_customer', $sc_create_params, $params);
-
- // Somehow a customer ID saved in the system no longer pairs
- // with a Customer within Stripe. (Perhaps deleted using Stripe interface?).
- // Store the relationship between CiviCRM's email address for the Contact & Stripe's Customer ID.
- if (isset($stripe_customer)) {
- /*if ($this->isErrorReturn($stripe_customer)) {
- return $stripe_customer;
- }*/
- // Delete whatever we have for this customer.
- $query_params = array(
- 1 => array($email, 'String'),
- 2 => array($this->_paymentProcessor['id'], 'Integer'),
- );
- CRM_Core_DAO::executeQuery("DELETE FROM civicrm_stripe_customers
- WHERE email = %1 AND is_live = '{$this->_islive}' AND processor_id = %2", $query_params);
-
- // Create new record for this customer.
- $query_params = array(
- 1 => array($email, 'String'),
- 2 => array($stripe_customer->id, 'String'),
- 3 => array($this->_paymentProcessor['id'], 'Integer'),
- );
- CRM_Core_DAO::executeQuery("INSERT INTO civicrm_stripe_customers (email, id, is_live, processor_id)
- VALUES (%1, %2, '{$this->_islive}, %3')", $query_params);
- }
- else {
- // Customer was found in civicrm_stripe database, but unable to be
- // retrieved from Stripe, and unable to be created in Stripe. What luck :(
- CRM_Core_Error::fatal(ts('There was an error saving new customer within Stripe. Is Stripe down?'));
- }
+ // Customer was found in civicrm_stripe database, but not in Stripe.
+ // Delete existing customer record from CiviCRM and create a new customer
+ CRM_Stripe_Customer::delete($customerParams);
+ $stripeCustomer = CRM_Stripe_Customer::create($customerParams, $this);
}
}
// Prepare the charge array, minus Customer/Card details.
if (empty($params['description'])) {
- $params['description'] = ts('Backend contribution');
+ $params['description'] = ts('Backend Stripe contribution');
}
// Stripe charge.
@@ -619,8 +519,8 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
);
// Use Stripe Customer if we have a valid one. Otherwise just use the card.
- if (!empty($stripe_customer->id)) {
- $stripe_charge['customer'] = $stripe_customer->id;
+ if (!empty($stripeCustomer->id)) {
+ $stripe_charge['customer'] = $stripeCustomer->id;
}
else {
$stripe_charge['card'] = $card_token;
@@ -628,37 +528,39 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
// Handle recurring payments in doRecurPayment().
if (CRM_Utils_Array::value('is_recur', $params) && $params['contributionRecurID']) {
- return $this->doRecurPayment($params, $amount, $stripe_customer);
+ return $this->doRecurPayment($params, $amount, $stripeCustomer);
}
// Fire away! Check for errors before trying to submit.
- $stripe_response = $this->stripeCatchErrors('charge', $stripe_charge, $params);
- if (!empty($stripe_response)) {
- if ($this->isErrorReturn($stripe_response)) {
- return $stripe_response;
+ $stripeCharge = $this->stripeCatchErrors('charge', $stripe_charge, $params);
+ if (!empty($stripeCharge)) {
+ if ($this->isErrorReturn($stripeCharge)) {
+ self::handleErrorNotification($stripeCharge, $params['stripe_error_url']);
+ return $stripeCharge;
}
// Success! Return some values for CiviCRM.
- $params['trxn_id'] = $stripe_response->id;
+ $params['trxn_id'] = $stripeCharge->id;
// Return fees & net amount for Civi reporting.
// Uses new Balance Trasaction object.
- $balance_transaction = $this->stripeCatchErrors('retrieve_balance_transaction', $stripe_response->balance_transaction, $params);
- if (!empty($balance_transaction)) {
- if ($this->isErrorReturn($balance_transaction)) {
- return $balance_transaction;
+ $balanceTransaction = $this->stripeCatchErrors('retrieve_balance_transaction', $stripeCharge->balance_transaction, $params);
+ if (!empty($balanceTransaction)) {
+ if ($this->isErrorReturn($balanceTransaction)) {
+ self::handleErrorNotification($balanceTransaction, $params['stripe_error_url']);
+ return $balanceTransaction;
}
- $params['fee_amount'] = $balance_transaction->fee / 100;
- $params['net_amount'] = $balance_transaction->net / 100;
+ $params['fee_amount'] = $balanceTransaction->fee / 100;
+ $params['net_amount'] = $balanceTransaction->net / 100;
}
}
else {
// There was no response from Stripe on the create charge command.
- if (isset($error_url)) {
- CRM_Core_Error::statusBounce('Stripe transaction response not recieved! Check the Logs section of your stripe.com account.', $error_url);
+ if (isset($params['stripe_error_url'])) {
+ CRM_Core_Error::statusBounce('Stripe transaction response not received! Check the Logs section of your stripe.com account.', $params['stripe_error_url']);
}
else {
// Don't have return url - return error object to api
$core_err = CRM_Core_Error::singleton();
- $core_err->push(9000, 0, NULL, 'Stripe transaction response not recieved! Check the Logs section of your stripe.com account.');
+ $core_err->push(9000, 0, NULL, 'Stripe transaction response not received! Check the Logs section of your stripe.com account.');
return $core_err;
}
}
@@ -674,7 +576,7 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
* Assoc array of input parameters for this transaction.
* @param int $amount
* Transaction amount in USD cents.
- * @param object $stripe_customer
+ * @param object $stripeCustomer
* Stripe customer object generated by Stripe API.
*
* @return array
@@ -682,7 +584,7 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
*
* @throws \CiviCRM_API3_Exception
*/
- public function doRecurPayment(&$params, $amount, $stripe_customer) {
+ public function doRecurPayment(&$params, $amount, $stripeCustomer) {
// Get recurring contrib properties.
$frequency = $params['frequency_unit'];
$frequency_interval = (empty($params['frequency_interval']) ? 1 : $params['frequency_interval']);
@@ -744,8 +646,8 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
}
}
// Apply the disount through a negative balance.
- $stripe_customer->account_balance = -$discount_in_cents;
- $stripe_customer->save();
+ $stripeCustomer->account_balance = -$discount_in_cents;
+ $stripeCustomer->save();
}
// Tying a plan to a membership (or priceset->membership) makes it possible
@@ -776,12 +678,6 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
}
$plan_id = "{$membership_type_tag}every-{$frequency_interval}-{$frequency}-{$amount}-{$currency}{$mode_tag}";
- // Prepare escaped query params.
- $query_params = array(
- 1 => array($plan_id, 'String'),
- );
-
-
// Prepare escaped query params.
$query_params = array(
1 => array($plan_id, 'String'),
@@ -841,14 +737,14 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
'prorate' => FALSE,
'plan' => $plan_id,
);
- $stripe_response = $stripe_customer->subscriptions->create($cust_sub_params);
- $subscription_id = $stripe_response->id;
+ $stripeSubscription = $stripeCustomer->subscriptions->create($cust_sub_params);
+ $subscription_id = $stripeSubscription->id;
$recuring_contribution_id = $params['contributionRecurID'];
// Prepare escaped query params.
$query_params = array(
1 => array($subscription_id, 'String'),
- 2 => array($stripe_customer->id, 'String'),
+ 2 => array($stripeCustomer->id, 'String'),
3 => array($recuring_contribution_id, 'String'),
4 => array($this->_paymentProcessor['id'], 'Integer'),
);
@@ -887,8 +783,7 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
* @param array $params
* Name value pair of contribution data.
*
- * @return void
- *
+ * @throws \CiviCRM_API3_Exception
*/
public function doTransferCheckout(&$params, $component) {
self::doDirectPayment($params);
@@ -924,5 +819,57 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
$ipnClass->main();
}
+
+ /*******************************************************************
+ * THE FOLLOWING FUNCTIONS SHOULD BE REMOVED ONCE THEY ARE IN CORE
+ * getBillingEmail
+ * getContactId
+ ******************************************************************/
+
+ /**
+ * Get the billing email address
+ *
+ * @param array $params
+ * @param int $contactId
+ *
+ * @return string|NULL
+ */
+ protected static function getBillingEmail($params, $contactId) {
+ $billingLocationId = CRM_Core_BAO_LocationType::getBilling();
+
+ $emailAddress = CRM_Utils_Array::value("email-{$billingLocationId}", $params,
+ CRM_Utils_Array::value('email-Primary', $params,
+ CRM_Utils_Array::value('email', $params, NULL)));
+
+ if (empty($emailAddress) && !empty($contactId)) {
+ // Try and retrieve an email address from Contact ID
+ try {
+ $emailAddress = civicrm_api3('Email', 'getvalue', array(
+ 'contact_id' => $contactId,
+ 'return' => ['email'],
+ ));
+ }
+ catch (CiviCRM_API3_Exception $e) {
+ return NULL;
+ }
+ }
+ return $emailAddress;
+ }
+
+ /**
+ * Get the contact id
+ *
+ * @param array $params
+ *
+ * @return int ContactID
+ */
+ protected static function getContactId($params) {
+ return CRM_Utils_Array::value('contactID', $params,
+ CRM_Utils_Array::value('contact_id', $params,
+ CRM_Utils_Array::value('cms_contactID', $params,
+ CRM_Utils_Array::value('cid', $params, NULL
+ ))));
+ }
+
}
diff --git a/CRM/Core/Payment/StripeIPN.php b/CRM/Core/Payment/StripeIPN.php
index 4fee96fe24e84ec1d1f783950e2a934fd32efac1..c974da52edd9df70b6c99435cfd6b553aee132e1 100644
--- a/CRM/Core/Payment/StripeIPN.php
+++ b/CRM/Core/Payment/StripeIPN.php
@@ -4,53 +4,62 @@
* Handle Stripe Webhooks for recurring payments.
*/
-require_once 'CRM/Core/Page.php';
-
class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
- var $ppid = NULL;
- var $secret_key = NULL;
- var $is_email_receipt = 1;
+
+ // TODO: These vars should probably be protected, not public - but need to check them all first
+ public $ppid = NULL;
+ public $secret_key = NULL;
+ public $is_email_receipt = 1;
+
// By default, always retrieve the event from stripe to ensure we are
// not being fed garbage. However, allow an override so when we are
// testing, we can properly test a failed recurring contribution.
- var $verify_event = TRUE;
+ public $verify_event = TRUE;
// Properties of the event.
- var $test_mode;
- var $event_type = NULL;
- var $subscription_id = NULL;
- var $charge_id = NULL;
- var $previous_plan_id = NULL;
- var $plan_id = NULL;
- var $plan_amount = NULL;
- var $frequency_interval = NULL;
- var $frequency_unit = NULL;
- var $plan_name = NULL;
- var $plan_start = NULL;
+ public $test_mode;
+ public $event_type = NULL;
+ public $subscription_id = NULL;
+ public $charge_id = NULL;
+ public $previous_plan_id = NULL;
+ public $plan_id = NULL;
+ public $plan_amount = NULL;
+ public $frequency_interval = NULL;
+ public $frequency_unit = NULL;
+ public $plan_name = NULL;
+ public $plan_start = NULL;
// Derived properties.
- var $contact_id = NULL;
- var $contribution_recur_id = NULL;
- var $membership_id = NULL;
- var $event_id = NULL;
- var $invoice_id = NULL;
- var $receive_date = NULL;
- var $amount = NULL;
- var $fee = NULL;
- var $net_amount = NULL;
- var $previous_contribution_id = NULL;
- var $previous_contribution_status_id = NULL;
- var $previous_contribution_total_amount = NULL;
- var $previous_completed_contribution_id = NULL;
+ public $contact_id = NULL;
+ public $contribution_recur_id = NULL;
+ public $membership_id = NULL;
+ public $event_id = NULL;
+ public $invoice_id = NULL;
+ public $receive_date = NULL;
+ public $amount = NULL;
+ public $fee = NULL;
+ public $net_amount = NULL;
+ public $previous_contribution_id = NULL;
+ public $previous_contribution_status_id = NULL;
+ public $previous_contribution_total_amount = NULL;
+ public $previous_completed_contribution_id = NULL;
+ /**
+ * CRM_Core_Payment_StripeIPN constructor.
+ *
+ * @param $inputData
+ * @param bool $verify
+ *
+ * @throws \CRM_Core_Exception
+ */
public function __construct($inputData, $verify = TRUE) {
$this->verify_event = $verify;
$this->setInputParameters($inputData);
parent::__construct();
}
+
/**
* Store input array on the class.
- *
* We override base because our input parameter is an object
*
* @param array $parameters
@@ -58,8 +67,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
* @throws CRM_Core_Exception
*/
public function setInputParameters($parameters) {
- if (empty($parameters) || !is_object($parameters) || empty($parameters->id)) {
- throw new CRM_Core_Exception('Invalid input parameters. Should be an object with an id parameter.');
+ if (!is_object($parameters)) {
+ $this->exception('Invalid input parameters');
}
// Determine the proper Stripe Processor ID so we can get the secret key
@@ -67,7 +76,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
// The $_GET['processor_id'] value is set by CRM_Core_Payment::handlePaymentMethod.
if (!array_key_exists('processor_id', $_GET) || empty($_GET['processor_id'])) {
- throw new CRM_Core_Exception('Cannot determine processor id.');
+ $this->exception('Cannot determine processor id');
}
$this->ppid = $_GET['processor_id'];
@@ -77,7 +86,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
$this->secret_key = civicrm_api3('PaymentProcessor', 'getvalue', $params);
}
catch(Exception $e) {
- throw new CRM_Core_Exception('Failed to get Stripe secret key.');
+ $this->exception('Failed to get Stripe secret key');
}
// Now re-retrieve the data from Stripe to ensure it's legit.
@@ -91,17 +100,18 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
$this->_inputParameters = $parameters;
}
}
+
/**
- *
- * Get a parameter given to us by Stripe.
- * @param string $name
- * @param $type
- * @param bool $abort
- *
- * @return mixed
+ * Get a parameter given to us by Stripe.
+ *
+ * @param string $name
+ * @param $type
+ * @param bool $abort
+ *
+ * @return false|int|null|string
+ * @throws \CRM_Core_Exception
*/
public function retrieve($name, $type, $abort = TRUE) {
-
$class_name = get_class($this->_inputParameters->data->object);
$value = NULL;
switch ($name) {
@@ -175,27 +185,35 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
}
$value = CRM_Utils_Type::validate($value, $type, FALSE);
if ($abort && $value === NULL) {
- throw new CRM_Core_Exception("Could not find an entry for '$name'.");
+ echo "Failure: Missing Parameter<p>" . CRM_Utils_Type::escape($name, 'String');
+ $this->exception("Could not find an entry for $name");
}
return $value;
}
- function main() {
+ /**
+ * @return bool
+ * @throws \CRM_Core_Exception
+ * @throws \CiviCRM_API3_Exception
+ */
+ public function main() {
// Collect and determine all data about this event.
- $this->setInfo();
+ $this->event_type = $this->retrieve('event_type', 'String');
+
+ $pendingStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending');
switch($this->event_type) {
// Successful recurring payment.
case 'invoice.payment_succeeded':
+ $this->setInfo();
// Lets do a check to make sure this payment has the amount same as that of first contribution.
// If it's not a match, something is wrong (since when we update a plan, we generate a whole
// new recurring contribution).
if ($this->previous_contribution_total_amount != $this->amount) {
- throw new CRM_Core_Exception("Subscription amount mismatch. I have " . $this->amount . " and I expect " . $this->previous_contribution_total_amount . ".");
- return FALSE;
+ $this->exception("Subscription amount mismatch. I have " . $this->amount . " and I expect " . $this->previous_contribution_total_amount);
}
- if ($this->previous_contribution_status_id == 2) {
+ if ($this->previous_contribution_status_id == $pendingStatusId) {
// Update the contribution to include the fee.
civicrm_api3('Contribution', 'create', array(
'id' => $this->previous_contribution_id,
@@ -204,8 +222,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
'net_amount' => $this->net_amount,
));
// The last one was not completed, so complete it.
- $result = civicrm_api3('Contribution', 'completetransaction', array(
- 'sequential' => 1,
+ civicrm_api3('Contribution', 'completetransaction', array(
'id' => $this->previous_contribution_id,
'trxn_date' => $this->receive_date,
'trxn_id' => $this->charge_id,
@@ -215,13 +232,13 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
'payment_processor_id' => $this->ppid,
'is_email_receipt' => $this->is_email_receipt,
));
- } else {
+ }
+ else {
// The first contribution was completed, so create a new one.
// api contribution repeattransaction repeats the appropriate contribution if it is given
- // simply the recurring contribution id. It also updates the membership for us.
-
- $result = civicrm_api3('Contribution', 'repeattransaction', array(
+ // simply the recurring contribution id. It also updates the membership for us.
+ civicrm_api3('Contribution', 'repeattransaction', array(
// Actually, don't use contribution_recur_id until CRM-19945 patches make it in to 4.6/4.7
// and we have a way to require a minimum minor CiviCRM version.
//'contribution_recur_id' => $this->recurring_info->id,
@@ -247,22 +264,22 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
}
// Successful charge & more to come.
- $result = civicrm_api3('ContributionRecur', 'create', array(
- 'sequential' => 1,
+ civicrm_api3('ContributionRecur', 'create', array(
'id' => $this->contribution_recur_id,
'failure_count' => 0,
'contribution_status_id' => "In Progress"
));
- return TRUE;
+ return;
// Failed recurring payment.
case 'invoice.payment_failed':
+ $this->setInfo();
$fail_date = date("Y-m-d H:i:s");
- if ($this->previous_contribution_status_id == 2) {
+ if ($this->previous_contribution_status_id == $pendingStatusId) {
// If this contribution is Pending, set it to Failed.
- $result = civicrm_api3('Contribution', 'create', array(
+ civicrm_api3('Contribution', 'create', array(
'id' => $this->previous_contribution_id,
'contribution_status_id' => "Failed",
'receive_date' => $fail_date,
@@ -289,64 +306,64 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
));
$failure_count++;
- // Change the status of the Recurring and update failed attempts.
- $result = civicrm_api3('ContributionRecur', 'create', array(
- 'sequential' => 1,
+ // Change the status of the Recurring and update failed attempts.
+ civicrm_api3('ContributionRecur', 'create', array(
'id' => $this->contribution_recur_id,
'contribution_status_id' => "Failed",
'failure_count' => $failure_count,
'modified_date' => $fail_date,
));
- return TRUE;
+ return;
- //Subscription is cancelled
+ // Subscription is cancelled
case 'customer.subscription.deleted':
- //Cancel the recurring contribution
- $result = civicrm_api3('ContributionRecur', 'cancel', array(
+ $this->setInfo();
+ // Cancel the recurring contribution
+ civicrm_api3('ContributionRecur', 'cancel', array(
'id' => $this->contribution_recur_id,
));
- //Delete the record from Stripe's subscriptions table
+ // Delete the record from Stripe's subscriptions table
$query_params = array(
1 => array($this->subscription_id, 'String'),
);
CRM_Core_DAO::executeQuery("DELETE FROM civicrm_stripe_subscriptions
WHERE subscription_id = %1", $query_params);
- return TRUE;
+ return;
// One-time donation and per invoice payment.
case 'charge.succeeded':
+ //$this->setInfo();
+ // TODO: Implement this so we can mark payments as failed?
// Not implemented.
- return TRUE;
+ return;
// Subscription is updated. Delete existing recurring contribution and start a fresh one.
// This tells a story to site admins over editing a recurring contribution record.
case 'customer.subscription.updated':
+ $this->setInfo();
if (empty($this->previous_plan_id)) {
// Not a plan change...don't care.
- return TRUE;
+ return;
}
$new_civi_invoice = md5(uniqid(rand(), TRUE));
- if ($this->previous_contribution_status_id == 2) {
+ if ($this->previous_contribution_status_id == $pendingStatusId) {
// Cancel the pending contribution.
- $result = civicrm_api3('Contribution', 'delete', array(
- 'sequential' => 1,
+ civicrm_api3('Contribution', 'delete', array(
'id' => $this->previous_contribution_id,
));
}
// Cancel the old recurring contribution.
- $result = civicrm_api3('ContributionRecur', 'cancel', array(
- 'sequential' => 1,
+ civicrm_api3('ContributionRecur', 'cancel', array(
'id' => $this->contribution_recur_id
));
$new_contribution_recur = civicrm_api3('ContributionRecur', 'create', array(
- 'sequential' => 1,
'contact_id' => $this->contact_id,
'invoice_id' => $new_civi_invoice,
'amount' => $this->plan_amount,
@@ -387,6 +404,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
$query_params
);
+ // FIXME: MJW Do we need this custom handling for memberships here? Core should do all we need
if ($this->membership_id) {
$plan_elements = explode("-", $this->plan_id);
$plan_name_elements = explode("-", $this->plan_name);
@@ -399,8 +417,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
// Adjust to the new membership level.
if (!empty($new_membership_type_id)) {
- $result = civicrm_api3('Membership', 'create', array(
- 'sequential' => 1,
+ civicrm_api3('Membership', 'create', array(
'id' => $this->membership_id,
'membership_type_id' => $new_membership_type_id,
'contribution_recur_id' => $new_contribution_recur_id,
@@ -408,17 +425,17 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
));
// Create a new membership payment record.
- $result = civicrm_api3('MembershipPayment', 'create', array(
- 'sequential' => 1,
+ civicrm_api3('MembershipPayment', 'create', array(
'membership_id' => $this->membership_id,
'contribution_id' => $new_contribution_id,
));
}
}
- return TRUE;
+ return;
// Keep plans table in sync with Stripe when a plan is deleted.
case 'plan.deleted':
+ $this->setInfo();
$is_live = $this->test_mode == 1 ? 0 : 1;
$query_params = array(
1 => array($this->plan_id, 'String'),
@@ -428,10 +445,10 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
CRM_Core_DAO::executeQuery("DELETE FROM civicrm_stripe_plans WHERE
plan_id = %1 AND processor_id = %2 and is_live = %3", $query_params);
- return TRUE;
+ return;
}
// Unhandled event type.
- return TRUE;
+ return;
}
/**
@@ -440,10 +457,11 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
* Given the data passed to us via the Stripe Event, try to determine
* as much as we can about this event and set that information as
* properties to be used later.
+ *
+ * @throws \CRM_Core_Exception
+ * @throws \CiviCRM_API3_Exception
*/
- function setInfo() {
-
- $this->event_type = $this->retrieve('event_type', 'String');
+ public function setInfo() {
$this->test_mode = $this->retrieve('test_mode', 'Integer');
$abort = FALSE;
@@ -478,7 +496,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
}
}
catch(Exception $e) {
- throw new CRM_Core_Exception('Cannot get contribution amounts from Stripe.');
+ $this->exception('Cannot get contribution amounts');
}
} else {
// The customer had a credit on their subscription from a downgrade or gift card.
@@ -528,7 +546,7 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
// This is an unrecoverable error - without a contribution_recur record
// there is nothing we can do with an invoice.payment_succeeded
// event.
- throw new CRM_Core_Exception('I cannot find contribution_recur record for subscription: ' . $this->subscription_id);
+ $this->exception('I cannot find contribution_recur record for subscription: ' . $this->subscription_id);
}
}
@@ -564,14 +582,21 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
}
// Check for membership id.
+ // FIXME: MJW Not sure why we assign membership_id here
$membership = civicrm_api3('Membership', 'get', array(
'contribution_recur_id' => $this->contribution_recur_id,
));
if ($membership['count'] == 1) {
$this->membership_id = $membership['id'];
}
-
}
}
}
+
+ public function exception($message) {
+ $errorMessage = 'StripeIPN Exception: Event: ' . $this->event_type . ' Error: ' . $message;
+ Civi::log()->debug($errorMessage);
+ //throw new CRM_Core_Exception($errorMessage);
+ exit();
+ }
}
diff --git a/CRM/Stripe/Customer.php b/CRM/Stripe/Customer.php
new file mode 100644
index 0000000000000000000000000000000000000000..5bfcfe4ea7b0cd388bf9c9f74f62a7b930c30482
--- /dev/null
+++ b/CRM/Stripe/Customer.php
@@ -0,0 +1,127 @@
+<?php
+
+class CRM_Stripe_Customer {
+
+ /**
+ * Find an existing Stripe customer in the CiviCRM database
+ *
+ * @param $params
+ *
+ * @return null|string
+ * @throws \CRM_Core_Exception
+ */
+ public static function find($params) {
+ $requiredParams = ['is_live', 'processor_id'];
+ foreach ($requiredParams as $required) {
+ if (empty($required)) {
+ throw new CRM_Core_Exception('Stripe Customer (find): Missing required parameter: ' . $required);
+ }
+ }
+ if (empty($params['contact_id'])) {
+ throw new CRM_Core_Exception('Stripe Customer (find): contact_id is required');
+ }
+ $queryParams = [
+ 1 => [$params['contact_id'], 'String'],
+ 2 => [$params['is_live'], 'Boolean'],
+ 3 => [$params['processor_id'], 'Positive'],
+ ];
+
+ return CRM_Core_DAO::singleValueQuery("SELECT id
+ FROM civicrm_stripe_customers
+ WHERE contact_id = %1 AND is_live = %2 AND processor_id = %3", $queryParams);
+ }
+
+ /**
+ * Add a new Stripe customer to the CiviCRM database
+ *
+ * @param $params
+ *
+ * @throws \CRM_Core_Exception
+ */
+ public static function add($params) {
+ $requiredParams = ['contact_id', 'customer_id', 'is_live', 'processor_id'];
+ foreach ($requiredParams as $required) {
+ if (empty($required)) {
+ throw new CRM_Core_Exception('Stripe Customer (add): Missing required parameter: ' . $required);
+ }
+ }
+
+ $queryParams = [
+ 1 => [$params['contact_id'], 'String'],
+ 2 => [$params['customer_id'], 'String'],
+ 3 => [$params['is_live'], 'Boolean'],
+ 4 => [$params['processor_id'], 'Integer'],
+ ];
+ CRM_Core_DAO::executeQuery("INSERT INTO civicrm_stripe_customers
+ (contact_id, id, is_live, processor_id) VALUES (%1, %2, %3, %4)", $queryParams);
+ }
+
+ public static function create($params, $paymentProcessor) {
+ $requiredParams = ['contact_id', 'card_token', 'is_live', 'processor_id'];
+ // $optionalParams = ['email'];
+ foreach ($requiredParams as $required) {
+ if (empty($required)) {
+ throw new CRM_Core_Exception('Stripe Customer (create): Missing required parameter: ' . $required);
+ }
+ }
+
+ $contactDisplayName = civicrm_api3('Contact', 'getvalue', [
+ 'return' => 'display_name',
+ 'id' => $params['contact_id'],
+ ]);
+
+ $sc_create_params = [
+ 'description' => $contactDisplayName . ' (CiviCRM)',
+ 'card' => $params['card_token'],
+ 'email' => CRM_Utils_Array::value('email', $params),
+ 'metadata' => ['civicrm_contact_id' => $params['contact_id']],
+ ];
+
+ $stripeCustomer = $paymentProcessor->stripeCatchErrors('create_customer', $sc_create_params, $params);
+
+ // Store the relationship between CiviCRM's email address for the Contact & Stripe's Customer ID.
+ if (isset($stripeCustomer)) {
+ if ($paymentProcessor->isErrorReturn($stripeCustomer)) {
+ return $stripeCustomer;
+ }
+
+ $params = [
+ 'contact_id' => $params['contact_id'],
+ 'customer_id' => $stripeCustomer->id,
+ 'is_live' => $params['is_live'],
+ 'processor_id' => $params['processor_id'],
+ ];
+ self::add($params);
+ }
+ else {
+ Throw new CRM_Core_Exception(ts('There was an error saving new customer within Stripe.'));
+ }
+ return $stripeCustomer;
+ }
+
+ /**
+ * Delete a Stripe customer from the CiviCRM database
+ *
+ * @param array $params
+ *
+ * @throws \CRM_Core_Exception
+ */
+ public static function delete($params) {
+ $requiredParams = ['contact_id', 'is_live', 'processor_id'];
+ foreach ($requiredParams as $required) {
+ if (empty($required)) {
+ throw new CRM_Core_Exception('Stripe Customer (delete): Missing required parameter: ' . $required);
+ }
+ }
+
+ $queryParams = [
+ 1 => [$params['contact_id'], 'String'],
+ 2 => [$params['is_live'], 'Boolean'],
+ 3 => [$params['processor_id'], 'Integer'],
+ ];
+ $sql = "DELETE FROM civicrm_stripe_customers
+ WHERE contact_id = %1 AND is_live = %2 AND processor_id = %3";
+ CRM_Core_DAO::executeQuery($sql, $queryParams);
+ }
+
+}
diff --git a/CRM/Stripe/Page/Webhook.php b/CRM/Stripe/Page/Webhook.php
deleted file mode 100644
index ed454eb7aeb0ddf0e8a59859c811ccad1cadcff3..0000000000000000000000000000000000000000
--- a/CRM/Stripe/Page/Webhook.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/*
- * @file
- * Handle Stripe Webhooks for recurring payments.
- */
-
-require_once 'CRM/Core/Page.php';
-
-class CRM_Stripe_Page_Webhook extends CRM_Core_Page {
- function run() {
- function getRecurInfo($subscription_id,$test_mode) {
-
- $query_params = array(
- 1 => array($subscription_id, 'String'),
- );
- $sub_info_query = CRM_Core_DAO::executeQuery("SELECT contribution_recur_id
- FROM civicrm_stripe_subscriptions
- WHERE subscription_id = %1",
- $query_params);
-
- if (!empty($sub_info_query)) {
- $sub_info_query->fetch();
-
- if(!empty($sub_info_query->contribution_recur_id)) {
- $recurring_info = new StdClass;
- $recurring_info->id = $sub_info_query->contribution_recur_id;
- }
- else {
- header('HTTP/1.1 400 Bad Request');
- CRM_Core_Error::Fatal("Error relating this subscription id ($subscription_id) to the one in civicrm_stripe_subscriptions");
- CRM_Utils_System::civiExit();
- }
- }
- // Same approach as api repeattransaction. Find last contribution ascociated
- // with our recurring contribution.
- $recurring_info->previous_contribution_id = civicrm_api3('contribution', 'getvalue', array(
- 'return' => 'id',
- 'contribution_recur_id' => $recurring_info->id,
- 'options' => array('limit' => 1, 'sort' => 'id DESC'),
- 'contribution_test' => $test_mode,
- ));
- // Workaround for CRM-19945.
- try {
- $recurring_info->previous_completed_contribution_id = civicrm_api3('contribution', 'getvalue', array(
- 'return' => 'id',
- 'contribution_recur_id' => $recurring_info->id,
- 'contribution_status_id' => array('IN' => array('Completed')),
- 'options' => array('limit' => 1, 'sort' => 'id DESC'),
- 'contribution_test' => $test_mode,
- ));
- } catch (Exception $e) {
- // This is fine....could only be a pending in the db.
- }
- if (!empty($recurring_info->previous_contribution_id)) {
- //$previous_contribution_query->fetch();
- }
- else {
- header('HTTP/1.1 400 Bad Request');
- CRM_Core_Error::Fatal("ERROR: Stripe could not find contribution ($recurring_info->previous_contribution_id) in civicrm_contribution: " . $stripe_event_data);
- CRM_Utils_System::civiExit();
- }
- $current_recurring_contribution = civicrm_api3('ContributionRecur', 'get', array(
- 'sequential' => 1,
- 'return' => "payment_processor_id, financial_type_id, payment_instrument_id",
- 'id' => $recurring_info->id,
- ));
- $recurring_info->payment_processor_id = $current_recurring_contribution['values'][0]['payment_processor_id'];
- $recurring_info->financial_type_id = $current_recurring_contribution['values'][0]['financial_type_id'];
- $recurring_info->payment_instrument_id = $current_recurring_contribution['values'][0]['payment_instrument_id'];
- $recurring_info->contact_id = civicrm_api3('Contribution', 'getvalue', array(
- 'sequential' => 1,
- 'return' => "contact_id",
- 'id' => $recurring_info->previous_contribution_id,
- ));
-
- return $recurring_info;
- }
- // Get the data from Stripe.
- $data_raw = file_get_contents("php://input");
- $data = json_decode($data_raw);
- if (!$data) {
- header('HTTP/1.1 406 Not acceptable');
- CRM_Core_Error::Fatal("Stripe Callback: cannot json_decode data, exiting. <br /> $data");
- CRM_Utils_System::civiExit();
- }
-
- // Test mode is the opposite of live mode.
- $test_mode = (int)!$data->livemode;
-
- $processorId = CRM_Utils_Request::retrieve('ppid', 'Integer');
- try {
- if (empty($processorId)) {
- $stripe_key = civicrm_api3('PaymentProcessor', 'getvalue', array(
- 'return' => 'user_name',
- 'payment_processor_type_id' => 'Stripe',
- 'is_test' => $test_mode,
- 'is_active' => 1,
- 'options' => array('limit' => 1),
- ));
- }
- else {
- $stripe_key = civicrm_api3('PaymentProcessor', 'getvalue', array(
- 'return' => 'user_name',
- 'id' => $processorId,
- ));
- }
- }
- catch (CiviCRM_API3_Exception $e) {
- header('HTTP/1.1 400 Bad Request');
- CRM_Core_Error::fatal('Cannot find Stripe API key: ' . $e->getMessage());
- CRM_Utils_System::civiExit();
- }
-
- \Stripe\Stripe::setAppInfo('CiviCRM', CRM_Utils_System::version(), CRM_Utils_System::baseURL());
- \Stripe\Stripe::setApiKey($stripe_key);
-
- // Retrieve Event from Stripe using ID even though we already have the values now.
- // This is for extra security precautions mentioned here: https://stripe.com/docs/webhooks
- $stripe_event_data = \Stripe\Event::retrieve($data->id);
- // Not all event objects have a customer property. Check first.
- if (isset($stripe_event_data->data->object->customer)) {
- $customer_id = $stripe_event_data->data->object->customer;
- }
-
- switch($stripe_event_data->type) {
- // Successful recurring payment.
- case 'invoice.payment_succeeded':
- $subscription_id = $stripe_event_data->data->object->subscription;
- $new_invoice_id = $stripe_event_data->data->object->id;
- $receive_date = date("Y-m-d H:i:s", $stripe_event_data->data->object->date);
- $charge_id = $stripe_event_data->data->object->charge;
-
- // Get the Stripe charge object if one exists. Null charge still needs processing.
- if ( $charge_id !== null ) {
- try {
- $charge = \Stripe\Charge::retrieve($charge_id);
- $balance_transaction_id = $charge->balance_transaction;
- $balance_transaction = \Stripe\BalanceTransaction::retrieve($balance_transaction_id);
- $amount = $charge->amount / 100;
- $fee = $balance_transaction->fee / 100;
- }
- catch(Exception $e) {
- header('HTTP/1.1 400 Bad Request');
- CRM_Core_Error::Fatal("Failed to retrieve Stripe charge. Message: " . $e->getMessage());
- CRM_Utils_System::civiExit();
- }
- } else {
- // The customer had a credit on their subscription from a downgrade or gift card.
- $amount = 0;
- $fee = 0;
- }
-
- // First, get the recurring contribution id and previous contribution id.
- $recurring_info = getRecurInfo($subscription_id,$test_mode);
-
- // Fetch the previous contribution's status.
- $previous_contribution = civicrm_api3('Contribution', 'get', array(
- 'sequential' => 1,
- 'return' => "contribution_status_id,invoice_id",
- 'id' => $recurring_info->previous_contribution_id,
- 'contribution_test' => $test_mode,
- ));
- $previous_contribution_status = $previous_contribution['values'][0]['contribution_status_id'];
-
- // Check if the previous contribution's status is pending and update it
- // using create and then complete it, else repeat it if not pending.
- // When a member upgrades/downgrades mid-term, (or recurring contributor
- // changes levels), we are in a unique situation not knowing ahead of time
- // what the contribution amount really is. completetransaction can't modify
- // our amounts (except for fee). We'll need to update the contribution amounts
- // to the actual values from Stripe for accounting.
-
- if ($previous_contribution_status == "2") {
- // Note: using create contribution to edit won't recalculate the net_amount.
- // We need to calculate and explicitly change it.
- $net_amount = $amount - $fee;
- $pending_contribution = civicrm_api3('Contribution', 'create', array(
- 'id' => $recurring_info->previous_contribution_id,
- 'total_amount' => $amount,
- 'fee_amount' => $fee,
- 'net_amount' => $net_amount,
- 'receive_date' => $receive_date,
- ));
- // Leave some indication that this is legitimately supposed to be a $0 contribution,
- // by not leaving trxn_id empty.
- if ( $amount == 0 ) {
- $charge_id = $previous_contribution['values'][0]['invoice_id'];
- }
- // Now complete it.
- $result = civicrm_api3('Contribution', 'completetransaction', array(
- 'sequential' => 1,
- 'id' => $recurring_info->previous_contribution_id,
- 'trxn_date' => $receive_date,
- 'trxn_id' => $charge_id,
- 'total_amount' => $amount,
- 'fee_amount' => $fee,
- ));
-
- return;
-
- } else {
-
- // api contribution repeattransaction repeats the appropriate contribution if it is given
- // simply the recurring contribution id. It also updates the membership for us. However,
- // we add the amount and fee regardless of the expected amounts because we may have
- // upgraded or downgraded the membership, or recurring contribution level. This means
- // prorated invoices.
-
- $result = civicrm_api3('Contribution', 'repeattransaction', array(
- // Actually, don't use contribution_recur_id until CRM-19945 patches make it in to 4.6/4.7
- // and we have a way to require a minimum minor CiviCRM version.
- //'contribution_recur_id' => $recurring_info->id,
- 'original_contribution_id' => $recurring_info->previous_completed_contribution_id,
- 'contribution_status_id' => "Completed",
- 'receive_date' => $receive_date,
- 'trxn_id' => $charge_id,
- 'total_amount' => $amount,
- 'fee_amount' => $fee,
- //'invoice_id' => $new_invoice_id - contribution.repeattransaction doesn't support it currently
- 'is_email_receipt' => 1,
- ));
-
- // Update invoice_id manually. repeattransaction doesn't return the new contrib id either, so we update the db.
- $query_params = array(
- 1 => array($new_invoice_id, 'String'),
- 2 => array($charge_id, 'String'),
- );
- CRM_Core_DAO::executeQuery("UPDATE civicrm_contribution
- SET invoice_id = %1
- WHERE trxn_id = %2",
- $query_params);
-
-
- // Successful charge & more to come
- $result = civicrm_api3('ContributionRecur', 'create', array(
- 'sequential' => 1,
- 'id' => $recurring_info->id,
- 'failure_count' => 0,
- 'contribution_status_id' => "In Progress"
- ));
-
- CRM_Utils_System::civiExit();
- }
- break;
-
- // Failed recurring payment.
- case 'invoice.payment_failed':
- // Get the Stripe charge object.
- try {
- $charge = \Stripe\Charge::retrieve($stripe_event_data->data->object->charge);
- }
- catch(Exception $e) {
- header('HTTP/1.1 400 Bad Request');
- CRM_Core_Error::Fatal("Failed to retrieve Stripe charge. Message: " . $e->getMessage());
- CRM_Utils_System::civiExit();
- }
-
- // Build some params.
- $subscription_id = $stripe_event_data->data->object->subscription;
- $new_invoice_id = $stripe_event_data->data->object->id;
- $charge_id = $stripe_event_data->data->object->charge;
- $attempt_count = $stripe_event_data->data->object->attempt_count;
- $fail_date = date("Y-m-d H:i:s");
- $amount = $charge->amount / 100;
- $fee_amount = isset($charge->fee) ? ($charge->fee / 100) : 0;
- $transaction_id = $charge->id;
-
- // First, get the recurring contribution id and previous contribution id.
- $recurring_info = getRecurInfo($subscription_id,$test_mode);
-
- // Fetch the previous contribution's status.
- $previous_contribution_status = civicrm_api3('Contribution', 'getvalue', array(
- 'sequential' => 1,
- 'return' => "contribution_status_id",
- 'id' => $recurring_info->previous_contribution_id,
- 'contribution_test' => $test_mode,
- ));
-
- if ($previous_contribution_status == 2) {
- // If this contribution is Pending, set it to Failed.
- $result = civicrm_api3('Contribution', 'create', array(
- 'id' => $recurring_info->previous_contribution_id,
- 'contribution_recur_id' => $recurring_info->id,
- 'contribution_status_id' => "Failed",
- 'contact_id' => $recurring_info->contact_id,
- 'financial_type_id' => $recurring_info->financial_type_id,
- 'receive_date' => $fail_date,
- 'total_amount' => $amount,
- 'is_email_receipt' => 1,
- 'is_test' => $test_mode,
- ));
-
- }
- else {
- // Record a Failed contribution. Use repeattransaction for this when CRM-19984
- // patch makes it in 4.6/4.7.
- $result = civicrm_api3('Contribution', 'create', array(
- 'contribution_recur_id' => $recurring_info->id,
- 'contribution_status_id' => "Failed",
- 'contact_id' => $recurring_info->contact_id,
- 'financial_type_id' => $recurring_info->financial_type_id,
- 'receive_date' => $fail_date,
- 'total_amount' => $amount,
- 'is_email_receipt' => 1,
- 'is_test' => $test_mode,
- ));
- }
-
- $failure_count = civicrm_api3('ContributionRecur', 'getvalue', array(
- 'sequential' => 1,
- 'id' => $recurring_info->id,
- 'return' => 'failure_count',
- ));
- $failure_count++;
- // Change the status of the Recurring and update failed attempts.
- $result = civicrm_api3('ContributionRecur', 'create', array(
- 'sequential' => 1,
- 'id' => $recurring_info->id,
- 'contribution_status_id' => "Failed",
- 'failure_count' => $failure_count,
- 'modified_date' => $fail_date,
- 'is_test' => $test_mode,
- ));
-
- return;
- break;
-
-
- //Subscription is cancelled
- case 'customer.subscription.deleted':
- $subscription_id = $stripe_event_data->data->object->id;
-
- // First, get the recurring contribution id and previous contribution id.
- $recurring_info = getRecurInfo($subscription_id,$test_mode);
-
- //Cancel the recurring contribution
- $result = civicrm_api3('ContributionRecur', 'cancel', array(
- 'sequential' => 1,
- 'id' => $recurring_info->id,
- ));
-
- //Delete the record from Stripe's subscriptions table
- $query_params = array(
- 1 => array($subscription_id, 'String'),
- );
- CRM_Core_DAO::executeQuery("DELETE FROM civicrm_stripe_subscriptions
- WHERE subscription_id = %1", $query_params);
-
- break;
-
- // One-time donation and per invoice payment.
- case 'charge.succeeded':
- // Not implemented.
- CRM_Utils_System::civiExit();
- break;
-
-
- // Subscription is updated. Delete existing recurring contribution and start a fresh one.
- // This tells a story to site admins over editing a recurring contribution record.
- case 'customer.subscription.updated':
- if (empty($stripe_event_data->data->previous_attributes->plan->id)) {
- // Not a plan change...don't care.
- CRM_Utils_System::civiExit();
- }
- $subscription_id = $stripe_event_data->data->object->id;
- $new_amount = $stripe_event_data->data->object->plan->amount / 100;
- $new_frequency_interval = $stripe_event_data->data->object->plan->interval_count;
- $new_frequency_unit = $stripe_event_data->data->object->plan->interval;
- $plan_id = $stripe_event_data->data->object->plan->id;
- $plan_name = $stripe_event_data->data->object->plan->name;
- $plan_elements = explode("-", $plan_id);
- $plan_name_elements = explode("-", $plan_name);
- $created_date = date("Y-m-d H:i:s", $stripe_event_data->data->object->start);
- $new_civi_invoice = md5(uniqid(rand(), TRUE));
-
- // First, get the recurring contribution id and previous contribution id.
- $recurring_info = getRecurInfo($subscription_id,$test_mode);
-
- // Is there a pending charge due to a subcription change? Make up your mind!!
- $previous_contribution = civicrm_api3('Contribution', 'get', array(
- 'sequential' => 1,
- 'return' => "contribution_status_id,invoice_id",
- 'id' => $recurring_info->previous_contribution_id,
- 'contribution_test' => $test_mode,
- ));
- if ($previous_contribution['values'][0]['contribution_status_id'] == "2") {
- // Cancel the pending contribution.
- $result = civicrm_api3('Contribution', 'delete', array(
- 'sequential' => 1,
- 'id' => $recurring_info->previous_contribution_id,
- ));
- }
-
- // Cancel the old recurring contribution.
- $result = civicrm_api3('ContributionRecur', 'cancel', array(
- 'sequential' => 1,
- 'id' => $recurring_info->id
- ));
-
- $new_recurring_contribution = civicrm_api3('ContributionRecur', 'create', array(
- 'sequential' => 1,
- 'contact_id' => $recurring_info->contact_id,
- 'invoice_id' => $new_civi_invoice,
- 'amount' => $new_amount,
- 'auto_renew' => 1,
- 'created_date' => $created_date,
- 'frequency_unit' => $new_frequency_unit,
- 'frequency_interval' => $new_frequency_interval,
- 'contribution_status_id' => "In Progress",
- 'payment_processor_id' => $recurring_info->payment_processor_id,
- 'financial_type_id' => $recurring_info->financial_type_id,
- 'payment_instrument_id' => $recurring_info->payment_instrument_id,
- 'is_test' => $test_mode,
- ));
- $new_recurring_contribution_id = $new_recurring_contribution['values'][0]['id'];
- $new_contribution = civicrm_api3('Contribution', 'create', array(
- 'sequential' => 1,
- 'contact_id' => $recurring_info->contact_id,
- 'invoice_id' => $new_civi_invoice,
- 'total_amount' => $new_amount,
- 'contribution_recur_id' => $new_recurring_contribution_id,
- 'contribution_status_id' => "Pending",
- 'financial_type_id' => $recurring_info->financial_type_id,
- 'payment_instrument_id' => $recurring_info->payment_instrument_id,
- 'note' => "Created by Stripe webhook.",
- 'is_test' => $test_mode,
- ));
-
- // Prepare escaped query params.
- $query_params = array(
- 1 => array($new_recurring_contribution_id, 'Integer'),
- 2 => array($subscription_id, 'String'),
- );
- CRM_Core_DAO::executeQuery("UPDATE civicrm_stripe_subscriptions
- SET contribution_recur_id = %1 where subscription_id = %2", $query_params);
-
- // Find out if the plan is ascociated with a membership and if so
- // adjust it to the new level.
-
- $membership_result = civicrm_api3('Membership', 'get', array(
- 'sequential' => 1,
- 'return' => "membership_type_id,id",
- 'contribution_recur_id' => $recurring_info->id,
- ));
-
- if ("membertype_" == substr($plan_elements[0],0,11)) {
- $new_membership_type_id = substr($plan_elements[0],strrpos($plan_elements[0],'_') + 1);
- } else if ("membertype_" == substr($plan_name_elements[0],0,11)) {
- $new_membership_type_id = substr($plan_name_elements[0],strrpos($plan_name_elements[0],'_') + 1);
- }
-
- // Adjust to the new membership level.
- if (!empty($new_membership_type_id)) {
- $membership_id = $membership_result['values'][0]['id'];
- $result = civicrm_api3('Membership', 'create', array(
- 'sequential' => 1,
- 'id' => $membership_id,
- 'membership_type_id' => $new_membership_type_id,
- 'contact_id' => $recurring_info->contact_id,
- 'contribution_recur_id' => $new_recurring_contribution_id,
- 'num_terms' => 0,
- ));
-
- // Create a new membership payment record.
- $result = civicrm_api3('MembershipPayment', 'create', array(
- 'sequential' => 1,
- 'membership_id' => $membership_id,
- 'contribution_id' => $new_contribution['values'][0]['id'],
- ));
- }
-
- break;
-
- // Keep plans table in sync with Stripe when a plan is deleted.
- case 'plan.deleted':
- $plan_id = $stripe_event_data->data->object->id;
- // Prepare escaped query params.
- $query_params = array(
- 1 => array($plan_id, 'String'),
- 2 => array($processorId, 'Integer'),
- );
- CRM_Core_DAO::executeQuery("DELETE FROM civicrm_stripe_plans WHERE
- plan_id = %1 AND processor_id = %2", $query_params);
-
- break;
-
- return;
-
- }
-
- parent::run();
- }
-
-}
diff --git a/CRM/Stripe/Upgrader.php b/CRM/Stripe/Upgrader.php
index 30b7caa39d74550b85644082baadeee93e473c8b..656ffd0247d22cd91a5f08dbfcf0dd4e1591ee5f 100644
--- a/CRM/Stripe/Upgrader.php
+++ b/CRM/Stripe/Upgrader.php
@@ -10,18 +10,6 @@ class CRM_Stripe_Upgrader extends CRM_Stripe_Upgrader_Base {
// By convention, functions that look like "function upgrade_NNNN()" are
// upgrade tasks. They are executed in order (like Drupal's hook_update_N).
- /**
- * Standard: run an install sql script
- */
- public function install() {
- }
-
- /**
- * Standard: run an uninstall script
- */
- public function uninstall() {
- }
-
/**
* Add is_live column to civicrm_stripe_plans and civicrm_stripe_customers tables.
*
@@ -379,4 +367,20 @@ class CRM_Stripe_Upgrader extends CRM_Stripe_Upgrader_Base {
}
return TRUE;
}
+
+ public function upgrade_5010() {
+ $this->ctx->log->info('Applying Stripe update 5010. Adding contact_id to civicrm_stripe_customers.');
+ if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_stripe_customers', 'contact_id', FALSE)) {
+ CRM_Core_DAO::executeQuery('ALTER TABLE `civicrm_stripe_customers`
+ ADD COLUMN `contact_id` int(10) UNSIGNED DEFAULT NULL COMMENT "FK ID from civicrm_contact"');
+ CRM_Core_DAO::executeQuery('ALTER TABLE `civicrm_stripe_customers`
+ ADD CONSTRAINT `FK_civicrm_stripe_customers_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE;');
+ }
+
+ $this->ctx->log->info('Applying Stripe update 5010. Getting Contact IDs for civicrm_stripe_customers.');
+ civicrm_api3('StripeCustomer', 'updatecontactids', []);
+
+ return TRUE;
+ }
+
}
diff --git a/README.md b/README.md
index 66229b1d8142b261bcdb569e6b033c30215e5209..adf1dd3da161fb1fabbe7c42677742f1c0a2eab8 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Therefore the call back address for your site will be:
See below for the full address to add to the endpoint (replace NN with your actual ID number):
* For Drupal: https://example.com/civicrm/payment/ipn/NN
-* For Joomla: https://example.com/index.php/component/civicrm/?task=civicrm/payment/ipn/NN
+* For Joomla: https://example.com/?option=com_civicrm&task=civicrm/payment/ipn/NN
* For Wordpress: https://example.com/?page=CiviCRM&q=civicrm/payment/ipn/NN
Typically, you only need to configure the end point to send live transactions and you want it to send all events.
diff --git a/api/v3/StripeCustomer.php b/api/v3/StripeCustomer.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf01932aadc389892c38e8d8456fed9640a8a717
--- /dev/null
+++ b/api/v3/StripeCustomer.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * Stripe Customer API
+ *
+ */
+
+/**
+ * StripeCustomer.Get API specification
+ *
+ * @param array $spec description of fields supported by this API call
+ * @return void
+ * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
+ */
+function _civicrm_api3_stripe_customer_get_spec(&$spec) {
+ $spec['id']['title'] = ts("Stripe Customer ID");
+ $spec['id']['type'] = CRM_Utils_Type::T_STRING;
+ $spec['contact_id']['title'] = ts("CiviCRM Contact ID");
+ $spec['contact_id']['type'] = CRM_Utils_Type::T_INT;
+ $spec['is_live']['title'] = ts("Is live processor");
+ $spec['is_live']['type'] = CRM_Utils_Type::T_BOOLEAN;
+ $spec['processor_id']['title'] = ts("Payment Processor ID");
+ $spec['processor_id']['type'] = CRM_Utils_Type::T_INT;
+}
+
+/**
+ * StripeCustomer.Get API
+ * This api will update the civicrm_stripe_customers table and add contact IDs for all known email addresses
+ *
+ * @param array $params
+ * @see civicrm_api3_create_success
+ *
+ * @return array
+ */
+function civicrm_api3_stripe_customer_get($params) {
+ foreach ($params as $key => $value) {
+ $index = 1;
+ switch ($key) {
+ case 'id':
+ $where[$index] = "{$key}=%{$index}";
+ $whereParam[$index] = [$value, 'String'];
+ $index++;
+ break;
+
+ case 'contact_id':
+ $where[$index] = "{$key}=%{$index}";
+ $whereParam[$index] = [$value, 'Integer'];
+ $index++;
+ break;
+
+ case 'is_live':
+ $where[$index] = "{$key}=%{$index}";
+ $whereParam[$index] = [$value, 'Boolean'];
+ $index++;
+ break;
+
+ case 'processor_id':
+ $where[$index] = "{$key}=%{$index}";
+ $whereParam[$index] = [$value, 'Integer'];
+ $index++;
+ break;
+ }
+ }
+
+ $query = "SELECT * FROM civicrm_stripe_customers ";
+ if (count($where)) {
+ $whereClause = implode(' AND ', $where);
+ $query .= "WHERE {$whereClause}";
+ }
+ $dao = CRM_Core_DAO::executeQuery($query, $whereParam);
+
+ while ($dao->fetch()) {
+ $result = [
+ 'id' => $dao->id,
+ 'contact_id' => $dao->contact_id,
+ 'is_live' => $dao->is_live,
+ 'processor_id' => $dao->processor_id,
+ ];
+ if ($dao->email) {
+ $result['email'] = $dao->email;
+ }
+ $results[] = $result;
+ }
+ return civicrm_api3_create_success($results);
+}
+
+/**
+ * Stripe.Customer.Updatecontactids API
+ * This api will update the civicrm_stripe_customers table and add contact IDs for all known email addresses
+ *
+ * @param array $params
+ * @see civicrm_api3_create_success
+ *
+ * @return array
+ */
+function civicrm_api3_stripe_customer_updatecontactids($params) {
+ $dao = CRM_Core_DAO::executeQuery('SELECT email, id FROM civicrm_stripe_customers WHERE contact_id IS NULL');
+ $counts = [
+ 'updated' => 0,
+ 'failed' => 0,
+ ];
+ while ($dao->fetch()) {
+ $contactId = NULL;
+ try {
+ $contactId = civicrm_api3('Contact', 'getvalue', [
+ 'return' => "id",
+ 'email' => $dao->email,
+ ]);
+ }
+ catch (Exception $e) {
+ // Most common problem is duplicates.
+ if(preg_match("/Expected one Contact but found/", $e->getMessage())) {
+ // If we find more than one, first try to find it via a related subscription record
+ // using the customer id.
+ $sql = "SELECT c.id
+ FROM civicrm_contribution_recur rc
+ JOIN civicrm_stripe_subscriptions sc ON
+ rc.id = sc.contribution_recur_id
+ JOIN civicrm_contact c ON c.id = rc.contact_id
+ WHERE c.is_deleted = 0 AND customer_id = %0
+ ORDER BY start_date DESC LIMIT 1";
+ $dao_contribution = CRM_Core_DAO::executeQuery($sql, [0 => [$dao->id, 'String']]);
+ $dao_contribution->fetch();
+ if ($dao_contribution->id) {
+ $contactId = $dao_contribution->id;
+ }
+ if (empty($contactId)) {
+ // Still no luck. Now get desperate.
+ $sql = "SELECT c.id
+ FROM civicrm_contact c JOIN civicrm_email e ON c.id = e.contact_id
+ JOIN civicrm_contribution cc ON c.id = cc.contact_id
+ WHERE e.email = %0 AND c.is_deleted = 0 AND is_test = 0 AND
+ trxn_id LIKE 'ch_%' AND contribution_status_id = 1
+ ORDER BY receive_date DESC LIMIT 1";
+ $dao_contribution = CRM_Core_DAO::executeQuery($sql, [0 => [$dao->email, 'String']]);
+ $dao_contribution->fetch();
+ if ($dao_contribution->id) {
+ $contactId = $dao_contribution->id;
+ }
+ }
+ }
+ if (empty($contactId)) {
+ // Still no luck. Log it and move on.
+ Civi::log()->debug('Stripe Upgrader: No contact ID found for stripe customer with email: ' . $dao->email);
+ $counts['failed']++;
+ continue;
+ }
+ }
+
+ $sqlParams = [
+ 1 => [$contactId, 'Integer'],
+ 2 => [$dao->email, 'String'],
+ ];
+ $sql = 'UPDATE civicrm_stripe_customers SET contact_id=%1 WHERE email=%2';
+ CRM_Core_DAO::executeQuery($sql, $sqlParams);
+ $counts['updated']++;
+ }
+
+ return civicrm_api3_create_success($counts);
+}
diff --git a/info.xml b/info.xml
index 1eb8f63006280c51a580e6ad7a7ff1bd5a9b6dc6..b145ab5078bdcd828b710cb4b2b12b611578a113 100644
--- a/info.xml
+++ b/info.xml
@@ -12,11 +12,11 @@
<author>Matthew Wire (MJW Consulting)</author>
<email>mjw@mjwconsult.co.uk</email>
</maintainer>
- <releaseDate>2018-09-19</releaseDate>
- <version>5.0</version>
- <develStage>stable</develStage>
+ <releaseDate>2018-10-18</releaseDate>
+ <version>5.1</version>
+ <develStage>beta</develStage>
<compatibility>
- <ver>5.0</ver>
+ <ver>5.3</ver>
</compatibility>
<comments>Original Author: Joshua Walker (drastik) - Drastik by Design.
Jamie Mcclelland (ProgressiveTech) did a lot of the 5.x compatibility work.
diff --git a/sql/auto_install.sql b/sql/auto_install.sql
new file mode 100644
index 0000000000000000000000000000000000000000..6c7a9db03dd55c7b2d9a8c32cb435297a1903699
--- /dev/null
+++ b/sql/auto_install.sql
@@ -0,0 +1,29 @@
+/* Create required tables for Stripe */
+ CREATE TABLE IF NOT EXISTS `civicrm_stripe_customers` (
+ `id` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `contact_id` int(10) UNSIGNED DEFAULT NULL COMMENT 'FK ID from civicrm_contact',
+ `is_live` tinyint(4) NOT NULL COMMENT 'Whether this is a live or test transaction',
+ `processor_id` int(10) DEFAULT NULL COMMENT 'ID from civicrm_payment_processor',
+ UNIQUE KEY `id` (`id`),
+ CONSTRAINT `FK_civicrm_stripe_customers_contact_id` FOREIGN KEY (`contact_id`)
+ REFERENCES `civicrm_contact` (`id`) ON DELETE CASCADE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+ CREATE TABLE IF NOT EXISTS `civicrm_stripe_plans` (
+ `plan_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `is_live` tinyint(4) NOT NULL COMMENT 'Whether this is a live or test transaction',
+ `processor_id` int(10) DEFAULT NULL COMMENT 'ID from civicrm_payment_processor',
+ UNIQUE KEY `plan_id` (`plan_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+ CREATE TABLE IF NOT EXISTS `civicrm_stripe_subscriptions` (
+ `subscription_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `customer_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `contribution_recur_id` INT(10) UNSIGNED NULL DEFAULT NULL,
+ `end_time` int(11) NOT NULL DEFAULT '0',
+ `is_live` tinyint(4) NOT NULL COMMENT 'Whether this is a live or test transaction',
+ `processor_id` int(10) DEFAULT NULL COMMENT 'ID from civicrm_payment_processor',
+ KEY `end_time` (`end_time`), PRIMARY KEY `subscription_id` (`subscription_id`),
+ CONSTRAINT `FK_civicrm_stripe_contribution_recur_id` FOREIGN KEY (`contribution_recur_id`)
+ REFERENCES `civicrm_contribution_recur`(`id`) ON DELETE SET NULL ON UPDATE RESTRICT
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/sql/auto_uninstall.sql b/sql/auto_uninstall.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e687830c59cc9896cc67e07de02e99c2c110ef33
--- /dev/null
+++ b/sql/auto_uninstall.sql
@@ -0,0 +1,4 @@
+/* Remove Stripe tables on uninstall. */
+DROP TABLE civicrm_stripe_customers;
+DROP TABLE civicrm_stripe_plans;
+DROP TABLE civicrm_stripe_subscriptions;
\ No newline at end of file
diff --git a/stripe.php b/stripe.php
index bb1d5e2826ad79dfbb9a781ac529589541023db1..8fda3cd6a8d09db52c90234f66c83bb2a72550c3 100644
--- a/stripe.php
+++ b/stripe.php
@@ -25,41 +25,6 @@ function stripe_civicrm_xmlMenu(&$files) {
* Implementation of hook_civicrm_install().
*/
function stripe_civicrm_install() {
- // Create required tables for Stripe.
- require_once "CRM/Core/DAO.php";
- CRM_Core_DAO::executeQuery("
- CREATE TABLE IF NOT EXISTS `civicrm_stripe_customers` (
- `email` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
- `id` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
- `is_live` tinyint(4) NOT NULL COMMENT 'Whether this is a live or test transaction',
- `processor_id` int(10) DEFAULT NULL COMMENT 'ID from civicrm_payment_processor',
- UNIQUE KEY `id` (`id`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- ");
-
- CRM_Core_DAO::executeQuery("
- CREATE TABLE IF NOT EXISTS `civicrm_stripe_plans` (
- `plan_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
- `is_live` tinyint(4) NOT NULL COMMENT 'Whether this is a live or test transaction',
- `processor_id` int(10) DEFAULT NULL COMMENT 'ID from civicrm_payment_processor',
- UNIQUE KEY `plan_id` (`plan_id`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- ");
-
- CRM_Core_DAO::executeQuery("
- CREATE TABLE IF NOT EXISTS `civicrm_stripe_subscriptions` (
- `subscription_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
- `customer_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
- `contribution_recur_id` INT(10) UNSIGNED NULL DEFAULT NULL,
- `end_time` int(11) NOT NULL DEFAULT '0',
- `is_live` tinyint(4) NOT NULL COMMENT 'Whether this is a live or test transaction',
- `processor_id` int(10) DEFAULT NULL COMMENT 'ID from civicrm_payment_processor',
- KEY `end_time` (`end_time`), PRIMARY KEY `subscription_id` (`subscription_id`),
- CONSTRAINT `FK_civicrm_stripe_contribution_recur_id` FOREIGN KEY (`contribution_recur_id`)
- REFERENCES `civicrm_contribution_recur`(`id`) ON DELETE SET NULL ON UPDATE RESTRICT
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- ");
-
_stripe_civix_civicrm_install();
}
@@ -67,12 +32,6 @@ function stripe_civicrm_install() {
* Implementation of hook_civicrm_uninstall().
*/
function stripe_civicrm_uninstall() {
- // Remove Stripe tables on uninstall.
- require_once "CRM/Core/DAO.php";
- CRM_Core_DAO::executeQuery("DROP TABLE civicrm_stripe_customers");
- CRM_Core_DAO::executeQuery("DROP TABLE civicrm_stripe_plans");
- CRM_Core_DAO::executeQuery("DROP TABLE civicrm_stripe_subscriptions");
-
_stripe_civix_civicrm_uninstall();
}
@@ -80,22 +39,12 @@ function stripe_civicrm_uninstall() {
* Implementation of hook_civicrm_enable().
*/
function stripe_civicrm_enable() {
- $UF_webhook_paths = array(
- "Drupal" => "/civicrm/payment/ipn/NN",
- "Joomla" => "/index.php/component/civicrm/?task=civicrm/payment/ipn/NN",
- "WordPress" => "/?page=CiviCRM&q=civicrm/payment/ipn/NN"
- );
-
- // Use Drupal path as default if the UF isn't in the map above
- $webookhook_path = (array_key_exists(CIVICRM_UF, $UF_webhook_paths)) ?
- CIVICRM_UF_BASEURL . $UF_webhook_paths[CIVICRM_UF] :
- CIVICRM_UF_BASEURL . $UF_webhook_paths['Drupal'];
-
+ $UFWebhookPath = stripe_get_webhook_path(TRUE);
CRM_Core_Session::setStatus(
"
<br />Don't forget to set up Webhooks in Stripe so that recurring contributions are ended!
<br />Webhook path to enter in Stripe:
- <br/><em>$webookhook_path</em>
+ <br/><em>$UFWebhookPath</em>
<br />Replace NN with the actual payment processor ID configured on your site.
<br />
",
@@ -251,21 +200,37 @@ function stripe_civicrm_buildForm($formName, &$form) {
}
}
+/**
+ * Get the path of the webhook depending on the UF (eg Drupal, Joomla, Wordpress)
+ *
+ * @param bool $includeBaseUrl
+ *
+ * @return string
+ */
+function stripe_get_webhook_path($includeBaseUrl = TRUE) {
+ $UFWebhookPaths = [
+ "Drupal" => "civicrm/payment/ipn/NN",
+ "Joomla" => "?option=com_civicrm&task=civicrm/payment/ipn/NN",
+ "WordPress" => "?page=CiviCRM&q=civicrm/payment/ipn/NN"
+ ];
+
+
+ // Use Drupal path as default if the UF isn't in the map above
+ $UFWebhookPath = (array_key_exists(CIVICRM_UF, $UFWebhookPaths)) ?
+ $UFWebhookPaths[CIVICRM_UF] :
+ $UFWebhookPaths['Drupal'];
+ if ($includeBaseUrl) {
+ return CIVICRM_UF_BASEURL . '/' . $UFWebhookPath;
+ }
+ return $UFWebhookPath;
+}
+
/*
* Implementation of hook_idsException.
*
* Ensure webhooks don't get caught in the IDS check.
*/
function stripe_civicrm_idsException(&$skip) {
- // Handle old method.
- $skip[] = 'civicrm/stripe/webhook';
- $result = civicrm_api3('PaymentProcessor', 'get', array(
- 'sequential' => 1,
- 'return' => "id",
- 'class_name' => "Payment_stripe",
- 'is_active' => 1,
- ));
- foreach($result['values'] as $value) {
- $skip[] = 'civicrm/payment/ipn/' . $value['id'];
- }
+ // Path is always set to civicrm/payment/ipn (checked on Drupal/Joomla)
+ $skip[] = 'civicrm/payment/ipn';
}
diff --git a/templates/CRM/Stripe/Page/Webhook.tpl b/templates/CRM/Stripe/Page/Webhook.tpl
deleted file mode 100644
index 35e65227d2880ed1914437418cc34026ed05f17f..0000000000000000000000000000000000000000
--- a/templates/CRM/Stripe/Page/Webhook.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>This page is generated by CRM/Stripe/Page/Webhook.php</h3>
-
-<p>This is the path to use with your Webhook settings in your Stripe account.</p>
diff --git a/tests/katalon/civicrm-stripe-test-suite.html b/tests/katalon/civicrm-stripe-test-suite.html
index 597c470d4ddeceedc623bcc420fbcc9d77797bd9..23dd702bb2d62877360ba98f1d7be47027c64063 100644
--- a/tests/katalon/civicrm-stripe-test-suite.html
+++ b/tests/katalon/civicrm-stripe-test-suite.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta content="text/html; charset=UTF-8" http-equiv="content-type" />
- <title>civicrm-stripe-test-suite</title>
+ <title>new-test-suit</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
@@ -101,7 +101,7 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute<datalist><option>http://localhost:8001/civicrm/admin/paymentProcessor?reset=1</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>//form[@id='Search']/div[2]/div[2]/a[2]/span<datalist><option>//form[@id='Search']/div[2]/div[2]/a[2]/span</option><option>//a[2]/span</option></datalist></td><td></td>
+<tr><td>click</td><td>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Record Contribution (Check, Cash, EFT ...)'])[1]/following::span[1]<datalist><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Record Contribution (Check, Cash, EFT ...)'])[1]/following::span[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Submit Credit Card Contribution'])[1]/following::span[2]</option><option>//div[@id='contributions-subtab']/div[2]/a[2]/span</option><option>//a[2]/span</option></datalist></td><td></td>
</tr>
<tr><td>click</td><td>id=financial_type_id<datalist><option>id=financial_type_id</option><option>name=financial_type_id</option><option>//select[@id='financial_type_id']</option><option>//form[@id='Contribution']/div[3]/table/tbody/tr[2]/td[2]/select</option><option>//select</option><option>css=#financial_type_id</option></datalist></td><td></td>
</tr>
@@ -143,7 +143,7 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute<datalist><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute</option><option>http://localhost:8001/civicrm/admin/paymentProcessor?reset=1</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>//form[@id='Search']/div[2]/div[2]/a[2]/span<datalist><option>//form[@id='Search']/div[2]/div[2]/a[2]/span</option><option>//a[2]/span</option></datalist></td><td></td>
+<tr><td>click</td><td>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Record Contribution (Check, Cash, EFT ...)'])[1]/following::span[1]<datalist><option>//form[@id='Search']/div[2]/div[2]/a[2]/span</option><option>//a[2]/span</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Record Contribution (Check, Cash, EFT ...)'])[1]/following::span[1]</option></datalist></td><td></td>
</tr>
<tr><td>click</td><td>id=financial_type_id<datalist><option>id=financial_type_id</option><option>name=financial_type_id</option><option>//select[@id='financial_type_id']</option><option>//form[@id='Contribution']/div[3]/table/tbody/tr[2]/td[2]/select</option><option>//select</option><option>css=#financial_type_id</option></datalist></td><td></td>
</tr>
@@ -191,7 +191,7 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=member<datalist><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute</option><option>http://localhost:8001/civicrm/admin/paymentProcessor?reset=1</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=member</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>//div[@id='ui-id-31']/div/div[2]/a[2]<datalist><option>//div[@id='ui-id-31']/div/div[2]/a[2]</option><option>xpath=(//a[contains(@href, '/civicrm/contact/view/membership?reset=1&action=add&cid=109&context=membership&mode=live')])[2]</option><option>//div[4]/div/div[2]/a[2]</option></datalist></td><td></td>
+<tr><td>click</td><td>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Membership'])[3]/following::span[1]<datalist><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Membership'])[3]/following::span[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Submit Credit Card Membership'])[1]/following::span[2]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='New Activity'])[1]/preceding::span[1]</option><option>//div[@id='ui-id-27']/div/div[2]/a[2]/span</option><option>//div[4]/div/div[2]/a[2]/span</option></datalist></td><td></td>
</tr>
<tr><td>click</td><td>id=membership_type_id_1<datalist><option>id=membership_type_id_1</option><option>name=membership_type_id[1]</option><option>//select[@id='membership_type_id_1']</option><option>//span[@id='mem_type_id']/select[2]</option><option>//select[2]</option><option>css=#membership_type_id_1</option></datalist></td><td></td>
</tr>
@@ -237,7 +237,7 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=member<datalist><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=member</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute</option><option>http://localhost:8001/civicrm/admin/paymentProcessor?reset=1</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>//div[@id='ui-id-31']/div/div[2]/a[2]<datalist><option>//div[@id='ui-id-31']/div/div[2]/a[2]</option><option>xpath=(//a[contains(@href, '/civicrm/contact/view/membership?reset=1&action=add&cid=109&context=membership&mode=live')])[2]</option><option>//div[4]/div/div[2]/a[2]</option></datalist></td><td></td>
+<tr><td>click</td><td>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Membership'])[3]/following::span[1]<datalist><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Membership'])[3]/following::span[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Submit Credit Card Membership'])[1]/following::span[2]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Active Memberships'])[1]/preceding::span[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Membership'])[2]/preceding::span[1]</option><option>//div[@id='ui-id-27']/div/div[2]/a[2]/span</option><option>//div[4]/div/div[2]/a[2]/span</option></datalist></td><td></td>
</tr>
<tr><td>click</td><td>id=membership_type_id_1<datalist><option>id=membership_type_id_1</option><option>name=membership_type_id[1]</option><option>//select[@id='membership_type_id_1']</option><option>//span[@id='mem_type_id']/select[2]</option><option>//select[2]</option><option>css=#membership_type_id_1</option></datalist></td><td></td>
</tr>
@@ -289,7 +289,7 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=participant<datalist><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=participant</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=member</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute</option><option>http://localhost:8001/civicrm/admin/paymentProcessor?reset=1</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>//form[@id='Search']/div[3]/a[2]<datalist><option>//form[@id='Search']/div[3]/a[2]</option><option>xpath=(//a[contains(@href, '/civicrm/contact/view/participant?reset=1&action=add&cid=109&context=participant&mode=live')])[2]</option><option>//div[3]/a[2]</option></datalist></td><td></td>
+<tr><td>click</td><td>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Event Registration'])[2]/following::span[1]<datalist><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Event Registration'])[2]/following::span[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Submit Credit Card Event Registration'])[1]/following::span[2]</option><option>//form[@id='Search']/div[3]/a[2]/span</option><option>//div[3]/a[2]/span</option></datalist></td><td></td>
</tr>
<tr><td>mouseDown</td><td>css=#s2id_event_id a.select2-choice<datalist><option>css=#s2id_event_id a.select2-choice</option><option>id=membership_type_id_1</option><option>name=membership_type_id[1]</option><option>//select[@id='membership_type_id_1']</option><option>//span[@id='mem_type_id']/select[2]</option><option>//select[2]</option><option>css=#membership_type_id_1</option></datalist></td><td></td>
</tr>
@@ -327,7 +327,7 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=participant<datalist><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=member</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=contribute</option><option>http://localhost:8001/civicrm/admin/paymentProcessor?reset=1</option><option>http://localhost:8001/civicrm/contact/view?reset=1&cid=109&selectedChild=participant</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>//form[@id='Search']/div[3]/a[2]<datalist><option>//form[@id='Search']/div[3]/a[2]</option><option>xpath=(//a[contains(@href, '/civicrm/contact/view/participant?reset=1&action=add&cid=109&context=participant&mode=live')])[2]</option><option>//div[3]/a[2]</option></datalist></td><td></td>
+<tr><td>click</td><td>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Event Registration'])[2]/following::span[1]<datalist><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Add Event Registration'])[2]/following::span[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Submit Credit Card Event Registration'])[1]/following::span[2]</option><option>//form[@id='Search']/div[3]/a[2]/span</option><option>//div[3]/a[2]/span</option></datalist></td><td></td>
</tr>
<tr><td>mouseDown</td><td>css=#s2id_event_id a.select2-choice<datalist><option>css=#s2id_event_id a.select2-choice</option><option>id=membership_type_id_1</option><option>name=membership_type_id[1]</option><option>//select[@id='membership_type_id_1']</option><option>//span[@id='mem_type_id']/select[2]</option><option>//select[2]</option><option>css=#membership_type_id_1</option></datalist></td><td></td>
</tr>
@@ -371,8 +371,6 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/admin/contribute/amount?reset=1&action=update&id=1<datalist><option>http://localhost:8001/civicrm/admin/contribute?reset=1</option><option>http://localhost:8001/civicrm/admin/contribute/amount?reset=1&action=update&id=1</option></datalist></td><td></td>
</tr>
-<tr><td>check</td><td>id=payment_processor_5<datalist><option>id=payment_processor_5</option><option>name=payment_processor[5]</option><option>//input[@id='payment_processor_5']</option><option>//form[@id='Amount']/div[2]/table/tbody/tr[3]/td/input</option><option>//tr[3]/td/input</option><option>css=#payment_processor_5</option></datalist></td><td></td>
-</tr>
<tr><td>uncheck</td><td>id=payment_processor_1<datalist><option>id=payment_processor_1</option><option>name=payment_processor[1]</option><option>//input[@id='payment_processor_1']</option><option>//form[@id='Amount']/div[2]/table/tbody/tr[3]/td/input[3]</option><option>//td/input[3]</option><option>css=#payment_processor_1</option></datalist></td><td></td>
</tr>
<tr><td>uncheck</td><td>id=payment_processor_3<datalist><option>id=payment_processor_1</option><option>name=payment_processor[1]</option><option>//input[@id='payment_processor_1']</option><option>//form[@id='Amount']/div[2]/table/tbody/tr[3]/td/input[3]</option><option>//td/input[3]</option><option>css=#payment_processor_1</option><option>id=payment_processor_3</option></datalist></td><td></td>
@@ -389,8 +387,6 @@
<tbody>
<tr><td>open</td><td>http://localhost:8001/civicrm/contribute/transact?reset=1&id=1<datalist><option>http://localhost:8001/civicrm/admin/contribute?reset=1</option><option>http://localhost:8001/civicrm/contribute/transact?reset=1&id=1</option></datalist></td><td></td>
</tr>
-<tr><td>selectWindow</td><td>win_ser_1<datalist><option>win_ser_1</option></datalist></td><td></td>
-</tr>
<tr><td>click</td><td>id=credit_card_number<datalist><option>id=credit_card_number</option><option>name=credit_card_number</option><option>//input[@id='credit_card_number']</option><option>//div[@id='payment_information']/fieldset/div/div[2]/div[2]/input</option><option>//fieldset/div/div[2]/div[2]/input</option><option>css=#credit_card_number</option></datalist></td><td></td>
</tr>
<tr><td>type</td><td>id=credit_card_number<datalist><option>id=credit_card_number</option><option>name=credit_card_number</option><option>//input[@id='credit_card_number']</option><option>//div[@id='payment_information']/fieldset/div/div[2]/div[2]/input</option><option>//fieldset/div/div[2]/div[2]/input</option><option>css=#credit_card_number</option></datalist></td><td>4242424242424242</td>
@@ -515,71 +511,11 @@
</tr>
<tr><td>check</td><td>id=is_pay_later<datalist><option>id=is_pay_later</option><option>id=payment_processor_1</option><option>name=payment_processor[1]</option><option>//input[@id='payment_processor_1']</option><option>//form[@id='Amount']/div[2]/table/tbody/tr[3]/td/input[3]</option><option>//td/input[3]</option><option>css=#payment_processor_1</option></datalist></td><td></td>
</tr>
-<tr><td>selectFrame</td><td>index=0<datalist><option>index=0</option></datalist></td><td></td>
-</tr>
-<tr><td>editContent</td><td>//body<datalist><option>//body</option><option>css=body.cke_editable.cke_editable_themed.cke_contents_ltr.cke_show_borders</option></datalist></td><td><p>Do something</p></td>
-</tr>
-<tr><td>selectFrame</td><td>relative=parent<datalist><option>relative=parent</option></datalist></td><td></td>
-</tr>
<tr><td>click</td><td>id=_qf_Amount_next-top<datalist><option>id=_qf_Amount_next-top</option><option>name=_qf_Amount_next</option><option>//input[@id='_qf_Amount_next-top']</option><option>//form[@id='Amount']/div[2]/div[2]/span/input</option><option>//span/input</option><option>css=#_qf_Amount_next-top</option></datalist></td><td></td>
</tr>
</tbody></table>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
-<tr><td rowspan="1" colspan="3">Online Contribution Page Stripe Default, Pay Later</td></tr>
-</thead>
-<tbody>
-<tr><td>open</td><td>http://localhost:8001/civicrm/contribute/transact?reset=1&id=1<datalist><option>http://localhost:8001/civicrm/contribute/transact?reset=1&id=1</option><option>http://localhost:8001/civicrm/admin/contribute?reset=1</option></datalist></td><td></td>
-</tr>
-<tr><td>pause</td><td>2000<datalist><option>2000</option><option>10000</option></datalist></td><td></td>
-</tr>
-<tr><td>click</td><td>//form[@id='Main']/div[2]/fieldset/div/div[2]/label[2]<datalist><option>//form[@id='Main']/div[2]/fieldset/div/div[2]/label[2]</option><option>//fieldset/div/div[2]/label[2]</option></datalist></td><td></td>
-</tr>
-<tr><td>click</td><td>//form[@id='Main']/div[2]/fieldset/div/div[2]/label<datalist><option>//form[@id='Main']/div[2]/fieldset/div/div[2]/label</option><option>//fieldset/div/div[2]/label</option><option>css=div.crm-public-form-item.crm-section.payment_processor-section > div.content > label</option></datalist></td><td></td>
-</tr>
-<tr><td>pause</td><td>10000<datalist><option>10000</option></datalist></td><td></td>
-</tr>
-<tr><td>click</td><td>id=credit_card_number<datalist><option>id=credit_card_number</option><option>name=credit_card_number</option><option>//input[@id='credit_card_number']</option><option>//div[@id='payment_information']/fieldset/div/div[2]/div[2]/input</option><option>//fieldset/div/div[2]/div[2]/input</option><option>css=#credit_card_number</option></datalist></td><td></td>
-</tr>
-<tr><td>type</td><td>id=credit_card_number<datalist><option>id=credit_card_number</option><option>name=credit_card_number</option><option>//input[@id='credit_card_number']</option><option>//div[@id='payment_information']/fieldset/div/div[2]/div[2]/input</option><option>//fieldset/div/div[2]/div[2]/input</option><option>css=#credit_card_number</option></datalist></td><td>4242424242424242</td>
-</tr>
-<tr><td>click</td><td>id=cvv2<datalist><option>id=cvv2</option><option>name=cvv2</option><option>//input[@id='cvv2']</option><option>//div[@id='payment_information']/fieldset/div/div[3]/div[2]/input</option><option>//div/div[3]/div[2]/input</option><option>css=#cvv2</option></datalist></td><td></td>
-</tr>
-<tr><td>type</td><td>id=cvv2<datalist><option>id=cvv2</option><option>name=cvv2</option><option>//input[@id='cvv2']</option><option>//div[@id='payment_information']/fieldset/div/div[3]/div[2]/input</option><option>//div/div[3]/div[2]/input</option><option>css=#cvv2</option></datalist></td><td>123</td>
-</tr>
-<tr><td>click</td><td>id=credit_card_exp_date_M<datalist><option>id=credit_card_exp_date_M</option><option>name=credit_card_exp_date[M]</option><option>//select[@id='credit_card_exp_date_M']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select</option><option>//fieldset/div/div[4]/div[2]/select</option><option>css=#credit_card_exp_date_M</option></datalist></td><td></td>
-</tr>
-<tr><td>select</td><td>id=credit_card_exp_date_M<datalist><option>id=credit_card_exp_date_M</option><option>name=credit_card_exp_date[M]</option><option>//select[@id='credit_card_exp_date_M']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select</option><option>//fieldset/div/div[4]/div[2]/select</option><option>css=#credit_card_exp_date_M</option></datalist></td><td>label=Dec</td>
-</tr>
-<tr><td>click</td><td>//option[@value='12']<datalist><option>//option[@value='12']</option><option>//select[@id='credit_card_exp_date_M']/option[13]</option><option>//option[13]</option><option>css=option[value="12"]</option></datalist></td><td></td>
-</tr>
-<tr><td>click</td><td>id=credit_card_exp_date_Y<datalist><option>id=credit_card_exp_date_Y</option><option>name=credit_card_exp_date[Y]</option><option>//select[@id='credit_card_exp_date_Y']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select[2]</option><option>//select[2]</option><option>css=#credit_card_exp_date_Y</option></datalist></td><td></td>
-</tr>
-<tr><td>select</td><td>id=credit_card_exp_date_Y<datalist><option>id=credit_card_exp_date_Y</option><option>name=credit_card_exp_date[Y]</option><option>//select[@id='credit_card_exp_date_Y']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select[2]</option><option>//select[2]</option><option>css=#credit_card_exp_date_Y</option></datalist></td><td>label=2028</td>
-</tr>
-<tr><td>click</td><td>//option[@value='2028']<datalist><option>//option[@value='2028']</option><option>//select[@id='credit_card_exp_date_Y']/option[12]</option><option>//select[2]/option[12]</option><option>css=option[value="2028"]</option></datalist></td><td></td>
-</tr>
-<tr><td>click</td><td>id=billing_first_name<datalist><option>id=billing_first_name</option><option>name=billing_first_name</option><option>//input[@id='billing_first_name']</option><option>//div[@id='payment_information']/fieldset[2]/div/div/div[2]/input</option><option>//fieldset[2]/div/div/div[2]/input</option><option>css=#billing_first_name</option></datalist></td><td></td>
-</tr>
-<tr><td>type</td><td>id=billing_first_name<datalist><option>id=billing_first_name</option><option>name=billing_first_name</option><option>//input[@id='billing_first_name']</option><option>//div[@id='payment_information']/fieldset[2]/div/div/div[2]/input</option><option>//fieldset[2]/div/div/div[2]/input</option><option>css=#billing_first_name</option></datalist></td><td>Joe</td>
-</tr>
-<tr><td>type</td><td>id=billing_last_name<datalist><option>id=billing_last_name</option><option>name=billing_last_name</option><option>//input[@id='billing_last_name']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[3]/div[2]/input</option><option>//fieldset[2]/div/div[3]/div[2]/input</option><option>css=#billing_last_name</option></datalist></td><td>Joe</td>
-</tr>
-<tr><td>type</td><td>id=billing_street_address-5<datalist><option>id=billing_street_address-5</option><option>name=billing_street_address-5</option><option>//input[@id='billing_street_address-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[4]/div[2]/input</option><option>//fieldset[2]/div/div[4]/div[2]/input</option><option>css=#billing_street_address-5</option></datalist></td><td>123</td>
-</tr>
-<tr><td>type</td><td>id=billing_city-5<datalist><option>id=billing_city-5</option><option>name=billing_city-5</option><option>//input[@id='billing_city-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[5]/div[2]/input</option><option>//fieldset[2]/div/div[5]/div[2]/input</option><option>css=#billing_city-5</option></datalist></td><td>Joe</td>
-</tr>
-<tr><td>click</td><td>id=billing_postal_code-5<datalist><option>id=billing_postal_code-5</option><option>name=billing_postal_code-5</option><option>//input[@id='billing_postal_code-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[8]/div[2]/input</option><option>//div[8]/div[2]/input</option><option>css=#billing_postal_code-5</option></datalist></td><td></td>
-</tr>
-<tr><td>type</td><td>id=billing_postal_code-5<datalist><option>id=billing_postal_code-5</option><option>name=billing_postal_code-5</option><option>//input[@id='billing_postal_code-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[8]/div[2]/input</option><option>//div[8]/div[2]/input</option><option>css=#billing_postal_code-5</option></datalist></td><td>12345</td>
-</tr>
-<tr><td>clickAndWait</td><td>id=_qf_Main_upload-bottom<datalist><option>id=_qf_Main_upload-bottom</option><option>name=_qf_Main_upload</option><option>//input[@id='_qf_Main_upload-bottom']</option><option>//div[@id='crm-submit-buttons']/span/input</option><option>//div[12]/span/input</option><option>css=#_qf_Main_upload-bottom</option></datalist></td><td></td>
-</tr>
-<tr><td>click</td><td>id=_qf_Confirm_next-top<datalist><option>id=_qf_Confirm_next-top</option><option>name=_qf_Confirm_next</option><option>//input[@id='_qf_Confirm_next-top']</option><option>//div[@id='crm-submit-buttons']/span/input</option><option>//span/input</option><option>css=#_qf_Confirm_next-top</option></datalist></td><td></td>
-</tr>
-</tbody></table>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
<tr><td rowspan="1" colspan="3">Setup Contribution Page Stripe Default, no confirmation</td></tr>
</thead>
<tbody>
@@ -597,9 +533,11 @@
</tr>
<tr><td>click</td><td>id=ui-id-25<datalist><option>id=ui-id-25</option><option>link=Title</option><option>//a[contains(text(),'Title')]</option><option>//a[@id='ui-id-25']</option><option>//li[@id='tab_settings']/a</option><option>//a[contains(@href, '/civicrm/admin/contribute/settings?reset=1&action=update&id=1')]</option><option>//div[3]/div[2]/div/ul/li/a</option><option>css=#ui-id-25</option></datalist></td><td></td>
</tr>
-<tr><td>uncheck</td><td>id=is_confirm_enabled<datalist><option>id=is_confirm_enabled</option><option>name=is_confirm_enabled</option><option>//input[@id='is_confirm_enabled']</option><option>//form[@id='Settings']/div[3]/table[3]/tbody/tr/td[2]/input</option><option>//table[3]/tbody/tr/td[2]/input</option><option>css=#is_confirm_enabled</option></datalist></td><td></td>
+<tr><td>open</td><td>http://localhost:8001/civicrm/admin/contribute/settings?reset=1&action=update&id=1<datalist><option>http://localhost:8001/civicrm/admin/contribute/settings?reset=1&action=update&id=1</option></datalist></td><td></td>
</tr>
-<tr><td>click</td><td>id=_qf_Settings_next-bottom<datalist><option>id=_qf_Settings_next-bottom</option><option>//input[@id='_qf_Settings_next-bottom']</option><option>//form[@id='Settings']/div[3]/div[2]/span/input</option><option>//div[2]/span/input</option><option>css=#_qf_Settings_next-bottom</option></datalist></td><td></td>
+<tr><td>uncheck</td><td>id=is_confirm_enabled<datalist><option>id=is_confirm_enabled</option><option>name=is_confirm_enabled</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Profile to be included in the honoree section'])[1]/following::input[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Email Address'])[1]/following::input[2]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Use a confirmation page?'])[1]/preceding::input[1]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Allow sharing through social media?'])[1]/preceding::input[2]</option><option>//input[@id='is_confirm_enabled']</option><option>//form[@id='Settings']/div[3]/table[3]/tbody/tr/td[2]/input</option><option>//table[3]/tbody/tr/td[2]/input</option><option>css=#is_confirm_enabled</option></datalist></td><td></td>
+</tr>
+<tr><td>click</td><td>id=_qf_Settings_next-top<datalist><option>id=_qf_Settings_next-top</option><option>name=_qf_Settings_next</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Personal Campaigns'])[1]/following::input[6]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='Widgets'])[1]/following::input[6]</option><option>xpath=(.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/preceding::input[4]</option><option>//input[@id='_qf_Settings_next-top']</option><option>//form[@id='Settings']/div[3]/div/span/input</option><option>//span/input</option><option>css=#_qf_Settings_next-top</option></datalist></td><td></td>
</tr>
</tbody></table>
<table cellpadding="1" cellspacing="1" border="1">
@@ -678,6 +616,56 @@
</tbody></table>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
+<tr><td rowspan="1" colspan="3">Online Contribution Page Stripe Default, Pay Later</td></tr>
+</thead>
+<tbody>
+<tr><td>open</td><td>http://localhost:8001/civicrm/contribute/transact?reset=1&id=1<datalist><option>http://localhost:8001/civicrm/contribute/transact?reset=1&id=1</option><option>http://localhost:8001/civicrm/admin/contribute?reset=1</option></datalist></td><td></td>
+</tr>
+<tr><td>pause</td><td>2000<datalist><option>2000</option><option>10000</option></datalist></td><td></td>
+</tr>
+<tr><td>pause</td><td>10000<datalist><option>10000</option></datalist></td><td></td>
+</tr>
+<tr><td>click</td><td>id=credit_card_number<datalist><option>id=credit_card_number</option><option>name=credit_card_number</option><option>//input[@id='credit_card_number']</option><option>//div[@id='payment_information']/fieldset/div/div[2]/div[2]/input</option><option>//fieldset/div/div[2]/div[2]/input</option><option>css=#credit_card_number</option></datalist></td><td></td>
+</tr>
+<tr><td>type</td><td>id=credit_card_number<datalist><option>id=credit_card_number</option><option>name=credit_card_number</option><option>//input[@id='credit_card_number']</option><option>//div[@id='payment_information']/fieldset/div/div[2]/div[2]/input</option><option>//fieldset/div/div[2]/div[2]/input</option><option>css=#credit_card_number</option></datalist></td><td>4242424242424242</td>
+</tr>
+<tr><td>click</td><td>id=cvv2<datalist><option>id=cvv2</option><option>name=cvv2</option><option>//input[@id='cvv2']</option><option>//div[@id='payment_information']/fieldset/div/div[3]/div[2]/input</option><option>//div/div[3]/div[2]/input</option><option>css=#cvv2</option></datalist></td><td></td>
+</tr>
+<tr><td>type</td><td>id=cvv2<datalist><option>id=cvv2</option><option>name=cvv2</option><option>//input[@id='cvv2']</option><option>//div[@id='payment_information']/fieldset/div/div[3]/div[2]/input</option><option>//div/div[3]/div[2]/input</option><option>css=#cvv2</option></datalist></td><td>123</td>
+</tr>
+<tr><td>click</td><td>id=credit_card_exp_date_M<datalist><option>id=credit_card_exp_date_M</option><option>name=credit_card_exp_date[M]</option><option>//select[@id='credit_card_exp_date_M']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select</option><option>//fieldset/div/div[4]/div[2]/select</option><option>css=#credit_card_exp_date_M</option></datalist></td><td></td>
+</tr>
+<tr><td>select</td><td>id=credit_card_exp_date_M<datalist><option>id=credit_card_exp_date_M</option><option>name=credit_card_exp_date[M]</option><option>//select[@id='credit_card_exp_date_M']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select</option><option>//fieldset/div/div[4]/div[2]/select</option><option>css=#credit_card_exp_date_M</option></datalist></td><td>label=Dec</td>
+</tr>
+<tr><td>click</td><td>//option[@value='12']<datalist><option>//option[@value='12']</option><option>//select[@id='credit_card_exp_date_M']/option[13]</option><option>//option[13]</option><option>css=option[value="12"]</option></datalist></td><td></td>
+</tr>
+<tr><td>click</td><td>id=credit_card_exp_date_Y<datalist><option>id=credit_card_exp_date_Y</option><option>name=credit_card_exp_date[Y]</option><option>//select[@id='credit_card_exp_date_Y']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select[2]</option><option>//select[2]</option><option>css=#credit_card_exp_date_Y</option></datalist></td><td></td>
+</tr>
+<tr><td>select</td><td>id=credit_card_exp_date_Y<datalist><option>id=credit_card_exp_date_Y</option><option>name=credit_card_exp_date[Y]</option><option>//select[@id='credit_card_exp_date_Y']</option><option>//div[@id='payment_information']/fieldset/div/div[4]/div[2]/select[2]</option><option>//select[2]</option><option>css=#credit_card_exp_date_Y</option></datalist></td><td>label=2028</td>
+</tr>
+<tr><td>click</td><td>//option[@value='2028']<datalist><option>//option[@value='2028']</option><option>//select[@id='credit_card_exp_date_Y']/option[12]</option><option>//select[2]/option[12]</option><option>css=option[value="2028"]</option></datalist></td><td></td>
+</tr>
+<tr><td>click</td><td>id=billing_first_name<datalist><option>id=billing_first_name</option><option>name=billing_first_name</option><option>//input[@id='billing_first_name']</option><option>//div[@id='payment_information']/fieldset[2]/div/div/div[2]/input</option><option>//fieldset[2]/div/div/div[2]/input</option><option>css=#billing_first_name</option></datalist></td><td></td>
+</tr>
+<tr><td>type</td><td>id=billing_first_name<datalist><option>id=billing_first_name</option><option>name=billing_first_name</option><option>//input[@id='billing_first_name']</option><option>//div[@id='payment_information']/fieldset[2]/div/div/div[2]/input</option><option>//fieldset[2]/div/div/div[2]/input</option><option>css=#billing_first_name</option></datalist></td><td>Joe</td>
+</tr>
+<tr><td>type</td><td>id=billing_last_name<datalist><option>id=billing_last_name</option><option>name=billing_last_name</option><option>//input[@id='billing_last_name']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[3]/div[2]/input</option><option>//fieldset[2]/div/div[3]/div[2]/input</option><option>css=#billing_last_name</option></datalist></td><td>Joe</td>
+</tr>
+<tr><td>type</td><td>id=billing_street_address-5<datalist><option>id=billing_street_address-5</option><option>name=billing_street_address-5</option><option>//input[@id='billing_street_address-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[4]/div[2]/input</option><option>//fieldset[2]/div/div[4]/div[2]/input</option><option>css=#billing_street_address-5</option></datalist></td><td>123</td>
+</tr>
+<tr><td>type</td><td>id=billing_city-5<datalist><option>id=billing_city-5</option><option>name=billing_city-5</option><option>//input[@id='billing_city-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[5]/div[2]/input</option><option>//fieldset[2]/div/div[5]/div[2]/input</option><option>css=#billing_city-5</option></datalist></td><td>Joe</td>
+</tr>
+<tr><td>click</td><td>id=billing_postal_code-5<datalist><option>id=billing_postal_code-5</option><option>name=billing_postal_code-5</option><option>//input[@id='billing_postal_code-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[8]/div[2]/input</option><option>//div[8]/div[2]/input</option><option>css=#billing_postal_code-5</option></datalist></td><td></td>
+</tr>
+<tr><td>type</td><td>id=billing_postal_code-5<datalist><option>id=billing_postal_code-5</option><option>name=billing_postal_code-5</option><option>//input[@id='billing_postal_code-5']</option><option>//div[@id='payment_information']/fieldset[2]/div/div[8]/div[2]/input</option><option>//div[8]/div[2]/input</option><option>css=#billing_postal_code-5</option></datalist></td><td>12345</td>
+</tr>
+<tr><td>clickAndWait</td><td>id=_qf_Main_upload-bottom<datalist><option>id=_qf_Main_upload-bottom</option><option>name=_qf_Main_upload</option><option>//input[@id='_qf_Main_upload-bottom']</option><option>//div[@id='crm-submit-buttons']/span/input</option><option>//div[12]/span/input</option><option>css=#_qf_Main_upload-bottom</option></datalist></td><td></td>
+</tr>
+<tr><td>click</td><td>id=_qf_Confirm_next-top<datalist><option>id=_qf_Confirm_next-top</option><option>name=_qf_Confirm_next</option><option>//input[@id='_qf_Confirm_next-top']</option><option>//div[@id='crm-submit-buttons']/span/input</option><option>//span/input</option><option>css=#_qf_Confirm_next-top</option></datalist></td><td></td>
+</tr>
+</tbody></table>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
<tr><td rowspan="1" colspan="3">Test Webform</td></tr>
</thead>
<tbody>
@@ -717,4 +705,4 @@
</tr>
</tbody></table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/phpunit/CRM/Stripe/BaseTest.php b/tests/phpunit/CRM/Stripe/BaseTest.php
index 47878b0ac0b04366033b7769bccdc584ea2920f1..e26ebb93bd9f5e0b893b96f11453b8c3b202a202 100644
--- a/tests/phpunit/CRM/Stripe/BaseTest.php
+++ b/tests/phpunit/CRM/Stripe/BaseTest.php
@@ -157,6 +157,7 @@ class CRM_Stripe_BaseTest extends \PHPUnit_Framework_TestCase implements Headles
'address_zip' => '12345',
),
'email' => $this->contact->email,
+ 'contactID' => $this->contact->id,
'description' => 'Test from Stripe Test Code',
'currencyID' => 'USD',
'invoiceID' => $this->_invoiceID,
diff --git a/tests/phpunit/CRM/Stripe/IpnTest.php b/tests/phpunit/CRM/Stripe/IpnTest.php
index a4306ee4a01c71ad7c5fb8735561b52810196ed3..884ed05af8cdd26808015f99590d572f103a71e3 100644
--- a/tests/phpunit/CRM/Stripe/IpnTest.php
+++ b/tests/phpunit/CRM/Stripe/IpnTest.php
@@ -90,11 +90,16 @@ class CRM_Stripe_IpnTest extends CRM_Stripe_BaseTest {
}
catch (Stripe\Error\InvalidRequest $e) {
// The plan has not been created yet, so create it.
+ $product = \Stripe\Product::create(array(
+ "name" => "CiviCRM testing product",
+ "type" => "service"
+ ));
+
$plan_details = array(
'id' => $plan_id,
'amount' => '40000',
'interval' => 'month',
- 'name' => "Test Updated Plan",
+ 'product' => $product,
'currency' => 'usd',
'interval_count' => 2
);
@@ -249,16 +254,11 @@ class CRM_Stripe_IpnTest extends CRM_Stripe_BaseTest {
*
*/
public function ipn($data, $verify = TRUE) {
- if (!class_exists('CRM_Core_Payment_StripeIPN')) {
- // The $_GET['processor_id'] value is normally set by
- // CRM_Core_Payment::handlePaymentMethod
- $_GET['processor_id'] = $this->_paymentProcessorID;
- $ipnClass = new CRM_Core_Payment_StripeIPN($data, $verify);
- $ipnClass->main();
- }
- else {
- trigger_error("Test suite depends on CRM_Core_Payment_StripeIPN");
- }
+ // The $_GET['processor_id'] value is normally set by
+ // CRM_Core_Payment::handlePaymentMethod
+ $_GET['processor_id'] = $this->_paymentProcessorID;
+ $ipnClass = new CRM_Core_Payment_StripeIPN($data, $verify);
+ $ipnClass->main();
}
/**
diff --git a/xml/Menu/stripe.xml b/xml/Menu/stripe.xml
deleted file mode 100644
index 1214117eb956c85a0dc14cab52b92af0db2f5715..0000000000000000000000000000000000000000
--- a/xml/Menu/stripe.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<menu>
- <item>
- <path>civicrm/stripe/webhook</path>
- <page_callback>CRM_Stripe_Page_Webhook</page_callback>
- <title>Webhook</title>
- <access_arguments>make online contributions</access_arguments>
- </item>
-</menu>