Revert "10698 dr-nucleus-issues-in-stripe:"

This reverts commit f8bdf26.
impactupgrade · Aug 16, 2023 · bffa317 · bffa317
1 parent f8bdf26
commit bffa317
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/src/main/java/com/impactupgrade/nucleus/client/StripeClient.java b/src/main/java/com/impactupgrade/nucleus/client/StripeClient.java
@@ -460,26 +460,12 @@ public void updateSubscriptionPaymentMethod(String subscriptionId, String paymen
     PaymentSource newSource = addCustomerSource(customer, paymentMethodToken);
 
     // set source as defaultSource for subscription
-    updateSubscriptionDefaultSource(subscription, newSource);
+    updateSubscriptionPaymentMethod(subscription, newSource);
 
     env.logJobInfo("updated customer {} payment method on subscription {}", customerId, subscriptionId);
   }
-
-  public void disableSubscriptionProration(String subscriptionId) throws StripeException {
-    env.logJobInfo("updating subscription proration behaviour to {} for subscription {}", SubscriptionUpdateParams.ProrationBehavior.NONE, subscriptionId);
 
-    Subscription subscription = Subscription.retrieve(subscriptionId, requestOptions);
-
-    SubscriptionUpdateParams subscriptionUpdateParams = SubscriptionUpdateParams.builder()
-        .setProrationBehavior(SubscriptionUpdateParams.ProrationBehavior.NONE)
-        .build();
-
-    subscription.update(subscriptionUpdateParams, requestOptions);
-
-    env.logJobInfo("updated subscription proration behaviour to {} for subscription {}", SubscriptionUpdateParams.ProrationBehavior.NONE, subscriptionId);
-  }
-
-  public void updateSubscriptionDefaultSource(Subscription subscription, PaymentSource newSource) throws StripeException {
+  public void updateSubscriptionPaymentMethod(Subscription subscription, PaymentSource newSource) throws StripeException {
     SubscriptionUpdateParams subscriptionParams = SubscriptionUpdateParams.builder()
         .setDefaultSource(newSource.getId())
         .build();

diff --git a/src/main/java/com/impactupgrade/nucleus/controller/StripeController.java b/src/main/java/com/impactupgrade/nucleus/controller/StripeController.java
@@ -355,7 +355,7 @@ public Response updateSource(
           }
 
           if (!newSource.getId().equalsIgnoreCase(subscriptionPaymentMethodId)) {
-            stripeClient.updateSubscriptionDefaultSource(subscription, newSource);
+            stripeClient.updateSubscriptionPaymentMethod(subscription, newSource);
             env.logJobInfo("updated payment method for subscription {}", subscription.getId());
           }
         }

diff --git a/src/main/java/com/impactupgrade/nucleus/service/segment/StripePaymentGatewayService.java b/src/main/java/com/impactupgrade/nucleus/service/segment/StripePaymentGatewayService.java
@@ -303,8 +303,6 @@ public void updateSubscription(ManageDonationEvent manageDonationEvent) throws S
     if (manageDonationEvent.getStripeToken() != null) {
       stripeClient.updateSubscriptionPaymentMethod(crmRecurringDonation.subscriptionId, manageDonationEvent.getStripeToken());
     }
-
-    stripeClient.disableSubscriptionProration(crmRecurringDonation.subscriptionId);
   }
 
   @Override