Merge pull request #20357 from mozilla/PAY-3635

fix(payments-next): Show pre-discount tax

Author: xlisachan

libs/payments/customer/src/lib/invoice.manager.spec.ts

@@ -307,7 +307,37 @@ describe('InvoiceManager', () => {
       );
       const mockPreviewUpcomingInvoice = InvoicePreviewFactory();
 
-      jest
+      const spy = jest
+        .spyOn(stripeClient, 'invoicesRetrieveUpcoming')
+        .mockResolvedValue(mockUpcomingInvoice);
+
+      mockedStripeInvoiceToFirstInvoicePreviewDTO.mockReturnValue(
+        mockPreviewUpcomingInvoice
+      );
+
+      const result = await invoiceManager.previewUpcomingSubscription({
+        customer: mockCustomer,
+        subscription: mockSubscription,
+      });
+      expect(result).toEqual(mockPreviewUpcomingInvoice);
+      expect(spy).toHaveBeenCalledWith({
+        customer: mockCustomer.id,
+        subscription: mockSubscription.id,
+        subscription_details: {
+          cancel_at_period_end: false,
+        },
+      });
+    });
+
+    it('passes empty string discounts when excludeDiscounts is true', async () => {
+      const mockCustomer = StripeCustomerFactory({ currency: 'usd' });
+      const mockSubscription = StripeSubscriptionFactory();
+      const mockUpcomingInvoice = StripeResponseFactory(
+        StripeUpcomingInvoiceFactory()
+      );
+      const mockPreviewUpcomingInvoice = InvoicePreviewFactory();
+
+      const spy = jest
         .spyOn(stripeClient, 'invoicesRetrieveUpcoming')
         .mockResolvedValue(mockUpcomingInvoice);
 
@@ -318,8 +348,17 @@ describe('InvoiceManager', () => {
       const result = await invoiceManager.previewUpcomingSubscription({
         customer: mockCustomer,
         subscription: mockSubscription,
+        excludeDiscounts: true,
       });
       expect(result).toEqual(mockPreviewUpcomingInvoice);
+      expect(spy).toHaveBeenCalledWith({
+        customer: mockCustomer.id,
+        subscription: mockSubscription.id,
+        subscription_details: {
+          cancel_at_period_end: false,
+        },
+        discounts: '',
+      });
     });
   });
 

libs/payments/customer/src/lib/invoice.manager.ts

@@ -187,16 +187,19 @@ export class InvoiceManager {
   async previewUpcomingSubscription({
     customer,
     subscription,
+    excludeDiscounts,
   }: {
     customer: StripeCustomer;
     subscription: StripeSubscription;
+    excludeDiscounts?: boolean;
   }): Promise<InvoicePreview> {
     const upcomingInvoice = await this.stripeClient.invoicesRetrieveUpcoming({
       customer: customer.id,
       subscription: subscription.id,
       subscription_details: {
         cancel_at_period_end: false,
       },
+      ...(excludeDiscounts ? { discounts: '' } : {}),
     });
 
     return stripeInvoiceToInvoicePreviewDTO(upcomingInvoice);

libs/payments/management/src/lib/subscriptionManagement.service.ts

@@ -459,6 +459,7 @@ export class SubscriptionManagementService {
       this.invoiceManager.previewUpcomingSubscription({
         customer,
         subscription,
+        excludeDiscounts: true,
       }),
       this.churnInterventionService.determineStaySubscribedEligibility(
         uid,
@@ -501,12 +502,13 @@ export class SubscriptionManagementService {
 
     const {
       nextInvoiceDate,
-      promotionName: nextPromotionName,
       subsequentAmount,
       subsequentAmountExcludingTax,
       subsequentTax,
     } = upcomingInvoice;
 
+    const nextPromotionName = subscription.discount?.coupon.name ?? null;
+
     const totalExclusiveTax = taxAmounts
       .filter((tax) => !tax.inclusive)
       .reduce((sum, tax) => sum + tax.amount, 0);
@@ -791,6 +793,7 @@ export class SubscriptionManagementService {
         await this.invoiceManager.previewUpcomingSubscription({
           customer: stripeCustomer,
           subscription,
+          excludeDiscounts: true,
         });
 
       if (!upcomingInvoice) {
@@ -912,6 +915,7 @@ export class SubscriptionManagementService {
         await this.invoiceManager.previewUpcomingSubscription({
           customer: stripeCustomer,
           subscription,
+          excludeDiscounts: true,
         });
 
       if (!upcomingInvoice) {