Changes for mjwshared 0.8. Should fix #182

CRM/Core/Payment/StripeIPN.php

@@ -184,8 +184,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
           $params = [
             'id' => $this->contribution['id'],
             'trxn_date' => $this->receive_date,
-            'contribution_trxn_id' => $this->invoice_id,
-            'payment_trxn_id' => $this->charge_id,
+            'order_reference' => $this->invoice_id,
+            'trxn_id' => $this->charge_id,
             'total_amount' => $this->amount,
             'fee_amount' => $this->fee,
           ];
@@ -199,8 +199,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
             'contribution_recur_id' => $this->contribution_recur_id,
             'contribution_status_id' => 'Completed',
             'receive_date' => $this->receive_date,
-            'contribution_trxn_id' => $this->invoice_id,
-            'payment_trxn_id' => $this->charge_id,
+            'order_reference' => $this->invoice_id,
+            'trxn_id' => $this->charge_id,
             'total_amount' => $this->amount,
             'fee_amount' => $this->fee,
             'original_contribution_id' => $this->contribution['id'],
@@ -221,7 +221,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
             'id' => $this->contribution['id'],
             'receive_date' => $this->receive_date,
             'cancel_reason' => $this->retrieve('failure_message', 'String'),
-            'payment_trxn_id' => $this->charge_id,
+            'trxn_id' => $this->charge_id,
+            'order_reference' => $this->invoice_id,
           ];
           $this->updateContributionFailed($params);
         }
@@ -230,8 +231,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
             'contribution_recur_id' => $this->contribution_recur_id,
             'contribution_status_id' => 'Failed',
             'receive_date' => $this->receive_date,
-            'contribution_trxn_id' => $this->invoice_id,
-            'payment_trxn_id' => $this->charge_id,
+            'order_reference' => $this->invoice_id,
+            'trxn_id' => $this->charge_id,
             'total_amount' => $this->amount,
             'fee_amount' => $this->fee,
             'original_contribution_id' => $this->contribution['id'],
@@ -261,7 +262,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
           'id' => $this->contribution['id'],
           'receive_date' => $this->receive_date,
           'cancel_reason' => $this->retrieve('failure_message', 'String'),
-          'payment_trxn_id' => $this->charge_id,
+          'trxn_id' => $this->charge_id,
+          'order_reference' => $this->invoice_id ?? $this->charge_id,
         ];
         $this->updateContributionFailed($params);
         return TRUE;
@@ -307,8 +309,8 @@ class CRM_Core_Payment_StripeIPN extends CRM_Core_Payment_BaseIPN {
           $params = [
             'id' => $this->contribution['id'],
             'trxn_date' => $this->receive_date,
-            'contribution_trxn_id' => $this->invoice_id ?: $this->charge_id,
-            'payment_trxn_id' => $this->charge_id,
+            'order_reference' => $this->invoice_id ?? $this->charge_id,
+            'trxn_id' => $this->charge_id,
             'total_amount' => $this->amount,
             'fee_amount' => $this->fee,
           ];

CRM/Stripe/Check.php

@@ -25,7 +25,7 @@ class CRM_Stripe_Check {
   /**
    * @var string
    */
-  const MIN_VERSION_MJWSHARED = '0.7';
+  const MIN_VERSION_MJWSHARED = '0.8';
 
   public static function checkRequirements(&$messages) {
     $extensions = civicrm_api3('Extension', 'get', [

docs/releasenotes.md

@@ -9,6 +9,13 @@ Where:
 * minor: Breaking change in some circumstances, or a new feature. Read carefully and make sure you understand the impact of the change.
 * incremental: A "safe" change / improvement. Should *always* be safe to upgrade.
 
+## Release 6.4.1 - Not yet released
+**This release REQUIRES that you upgrade mjwshared to 0.8.**
+
+* Fix [#196](https://lab.civicrm.org/extensions/stripe/issues/196): Recurring contributions with incorrect amount per default currency in stripe.
+* Fix [#198](https://lab.civicrm.org/extensions/stripe/issues/198): Trigger postInstall hook so we set the revision and don't trigger the upgrader on install.
+* Fix [#182](https://lab.civicrm.org/extensions/stripe/issues/182): Failed subscription payment, receipt sent, but contribution not updated when retried.
+
 ## Release 6.4
 **This release REQUIRES that you upgrade mjwshared to 0.7 and your Stripe API version must be 2019-12-03 or newer.**
 

info.xml

@@ -14,9 +14,9 @@
     <author>Matthew Wire (MJW Consulting)</author>
     <email>mjw@mjwconsult.co.uk</email>
   </maintainer>
-  <releaseDate>2020-05-10</releaseDate>
-  <version>6.4</version>
-  <develStage>stable</develStage>
+  <releaseDate>2020-05-30</releaseDate>
+  <version>6.4.1-alpha</version>
+  <develStage>alpha</develStage>
   <compatibility>
     <ver>5.24</ver>
   </compatibility>