Revision

mozilla · Mar 6, 2025 · d10f66f · d10f66f
1 parent f8c5f9f
commit d10f66f
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 184 deletions.
diff --git a/.../next/app/[locale]/[offeringId]/[interval]/checkout/[cartId]/(otherLayout)/success/en.ftl b/.../next/app/[locale]/[offeringId]/[interval]/checkout/[cartId]/(otherLayout)/success/en.ftl
diff --git a/...ents/next/app/[locale]/[offeringId]/[interval]/checkout/[cartId]/(startLayout)/layout.tsx b/...ents/next/app/[locale]/[offeringId]/[interval]/checkout/[cartId]/(startLayout)/layout.tsx
diff --git a/...ckout/[cartId]/(otherLayout)/error/en.ftl → ...[interval]/checkout/[cartId]/error/en.ftl b/...ckout/[cartId]/(otherLayout)/error/en.ftl → ...[interval]/checkout/[cartId]/error/en.ftl
diff --git a/...out/[cartId]/(otherLayout)/error/page.tsx → ...nterval]/checkout/[cartId]/error/page.tsx b/...out/[cartId]/(otherLayout)/error/page.tsx → ...nterval]/checkout/[cartId]/error/page.tsx
diff --git a/...heckout/[cartId]/(otherLayout)/layout.tsx → ...]/[interval]/checkout/[cartId]/layout.tsx b/...heckout/[cartId]/(otherLayout)/layout.tsx → ...]/[interval]/checkout/[cartId]/layout.tsx
@@ -17,6 +17,7 @@ import {
   SubscriptionTitle,
   TermsAndPrivacy,
 } from '@fxa/payments/ui/server';
+import { CartState } from '@fxa/shared/db/mysql/account';
 import { auth } from 'apps/payments/next/auth';
 import { config } from 'apps/payments/next/config';
 
@@ -25,7 +26,7 @@ export interface CheckoutSearchParams {
   promotion_code?: string;
 }
 
-export default async function CheckoutOtherLayout({
+export default async function CheckoutLayout({
   children,
   params,
 }: {
@@ -50,7 +51,6 @@ export default async function CheckoutOtherLayout({
   const purchaseDetails =
     cms.defaultPurchase.purchaseDetails.localizations.at(0) ||
     cms.defaultPurchase.purchaseDetails;
-  console.log(cart);
   return (
     <MetricsWrapper cart={cart}>
       {session?.user?.email && (
@@ -95,14 +95,22 @@ export default async function CheckoutOtherLayout({
             countryCode={cart.taxAddress?.countryCode}
             postalCode={cart.taxAddress?.postalCode}
           />
-          {cart.couponCode && (
+          {(cart.state === CartState.START && (
             <CouponForm
               cartId={cart.id}
               cartVersion={cart.version}
               promoCode={cart.couponCode}
-              readOnly={true}
+              readOnly={false}
             />
-          )}
+          )) ||
+            (cart.couponCode && (
+              <CouponForm
+                cartId={cart.id}
+                cartVersion={cart.version}
+                promoCode={cart.couponCode}
+                readOnly={true}
+              />
+            ))}
         </section>
 
         <div className="bg-white rounded-b-lg shadow-sm shadow-grey-300 border-t-0 mb-6 pt-4 px-4 pb-14 rounded-t-lg text-grey-600 tablet:clip-shadow tablet:rounded-t-none desktop:px-12 desktop:pb-12">

diff --git a/...artId]/(otherLayout)/needs_input/page.tsx → ...l]/checkout/[cartId]/needs_input/page.tsx b/...artId]/(otherLayout)/needs_input/page.tsx → ...l]/checkout/[cartId]/needs_input/page.tsx
diff --git a/...cartId]/(otherLayout)/processing/page.tsx → ...al]/checkout/[cartId]/processing/page.tsx b/...cartId]/(otherLayout)/processing/page.tsx → ...al]/checkout/[cartId]/processing/page.tsx
diff --git a/...ckout/[cartId]/(startLayout)/start/en.ftl → ...[interval]/checkout/[cartId]/start/en.ftl b/...ckout/[cartId]/(startLayout)/start/en.ftl → ...[interval]/checkout/[cartId]/start/en.ftl
diff --git a/...out/[cartId]/(startLayout)/start/page.tsx → ...nterval]/checkout/[cartId]/start/page.tsx b/...out/[cartId]/(startLayout)/start/page.tsx → ...nterval]/checkout/[cartId]/start/page.tsx
diff --git a/...t/[cartId]/(otherLayout)/success/page.tsx → ...erval]/checkout/[cartId]/success/page.tsx b/...t/[cartId]/(otherLayout)/success/page.tsx → ...erval]/checkout/[cartId]/success/page.tsx
@@ -121,10 +121,17 @@ export default async function CheckoutSuccess({
           </div>
           <div className="flex items-center justify-between text-grey-400">
             <span>
-              {formatPlanPricing(
-                cart.latestInvoicePreview?.totalAmount ?? null,
-                cart.latestInvoicePreview?.currency ?? '',
-                cart.interval
+              {l10n.getString(
+                'success-page-payment-confirmation-amount',
+                {
+                  amount: cart.latestInvoicePreview?.totalAmount,
+                  interval: cart.interval,
+                },
+                formatPlanPricing(
+                  cart.latestInvoicePreview?.totalAmount ?? null,
+                  cart.latestInvoicePreview?.currency ?? '',
+                  cart.interval
+                )
               )}
             </span>
             {cart.paymentInfo.type === 'external_paypal' ? (

diff --git a/libs/payments/cart/src/lib/checkout.service.spec.ts b/libs/payments/cart/src/lib/checkout.service.spec.ts
@@ -36,7 +36,7 @@ import {
   PriceManager,
   ProductManager,
   PromotionCodeManager,
-  STRIPE_CUSTOMER_METADATA,
+  STRIPE_SUBSCRIPTION_METADATA,
   SubscriptionManager,
   TaxAddressFactory,
 } from '@fxa/payments/customer';
@@ -447,7 +447,7 @@ describe('CheckoutService', () => {
       const mockUpdatedSubscription = StripeResponseFactory(
         StripeSubscriptionFactory({
           metadata: {
-            [STRIPE_CUSTOMER_METADATA.SubscriptionPromotionCode]:
+            [STRIPE_SUBSCRIPTION_METADATA.SubscriptionPromotionCode]:
               mockCart.couponCode as string,
           },
         })
@@ -476,11 +476,10 @@ describe('CheckoutService', () => {
         {
           metadata: {
             ...mockSubscription.metadata,
-            [STRIPE_CUSTOMER_METADATA.SubscriptionPromotionCode]:
+            [STRIPE_SUBSCRIPTION_METADATA.SubscriptionPromotionCode]:
               mockCart.couponCode,
           },
-        },
-        mockSubscription.metadata
+        }
       );
     });
   });

diff --git a/libs/payments/cart/src/lib/checkout.service.ts b/libs/payments/cart/src/lib/checkout.service.ts
@@ -227,16 +227,13 @@ export class CheckoutService {
     await this.customerChanged(uid);
 
     if (cart.couponCode) {
-      await this.subscriptionManager.update(
-        subscription.id,
-        {
-          metadata: {
-            [STRIPE_CUSTOMER_METADATA.SubscriptionPromotionCode]:
-              cart.couponCode,
-          },
+      await this.subscriptionManager.update(subscription.id, {
+        metadata: {
+          ...subscription.metadata,
+          [STRIPE_SUBSCRIPTION_METADATA.SubscriptionPromotionCode]:
+            cart.couponCode,
         },
-        subscription.metadata
-      );
+      });
     }
     await this.cartManager.finishCart(cart.id, version, {});
 

diff --git a/libs/payments/customer/src/lib/subscription.manager.spec.ts b/libs/payments/customer/src/lib/subscription.manager.spec.ts
@@ -15,7 +15,7 @@ import {
   StripeSubscriptionFactory,
   MockStripeConfigProvider,
 } from '@fxa/payments/stripe';
-import { STRIPE_CUSTOMER_METADATA } from './types';
+import { STRIPE_SUBSCRIPTION_METADATA } from './types';
 import { SubscriptionManager } from './subscription.manager';
 import { MockStatsDProvider } from '@fxa/shared/metrics/statsd';
 
@@ -177,21 +177,14 @@ describe('SubscriptionManager', () => {
     });
 
     it('updates metadata', async () => {
-      const mockMetadata = { amount: '1200', currency: 'usd' };
       const mockParams = {
         metadata: {
-          [STRIPE_CUSTOMER_METADATA.SubscriptionPromotionCode]: 'test-coupon',
+          [STRIPE_SUBSCRIPTION_METADATA.SubscriptionPromotionCode]:
+            'test-coupon',
         },
       };
 
-      const newParams = {
-        metadata: {
-          ...mockParams.metadata,
-          ...mockMetadata,
-        },
-      };
-
-      const mockSubscription = StripeSubscriptionFactory(newParams);
+      const mockSubscription = StripeSubscriptionFactory(mockParams);
       const mockResponse = StripeResponseFactory(mockSubscription);
 
       jest
@@ -200,21 +193,22 @@ describe('SubscriptionManager', () => {
 
       const result = await subscriptionManager.update(
         mockSubscription.id,
-        mockParams,
-        mockMetadata
+        mockParams
       );
 
       expect(stripeClient.subscriptionsUpdate).toBeCalledWith(
         mockSubscription.id,
-        newParams
+        mockParams
       );
       expect(result).toEqual(mockResponse);
     });
 
     it('throws if metadata key does not match', async () => {
       const mockParams = {
         metadata: {
-          [STRIPE_CUSTOMER_METADATA.SubscriptionPromotionCode]: 'test-coupon',
+          amount: '1200',
+          [STRIPE_SUBSCRIPTION_METADATA.SubscriptionPromotionCode]:
+            'test-coupon',
           promotionCode: 'test-coupon',
         },
       };

diff --git a/libs/payments/customer/src/lib/subscription.manager.ts b/libs/payments/customer/src/lib/subscription.manager.ts
@@ -11,7 +11,7 @@ import {
   StripeSubscription,
 } from '@fxa/payments/stripe';
 import { ACTIVE_SUBSCRIPTION_STATUSES } from '@fxa/payments/stripe';
-import { STRIPE_CUSTOMER_METADATA } from './types';
+import { STRIPE_SUBSCRIPTION_METADATA } from './types';
 import { InvalidPaymentIntentError, PaymentIntentNotFoundError } from './error';
 
 @Injectable()
@@ -38,21 +38,19 @@ export class SubscriptionManager {
 
   async update(
     subscriptionId: string,
-    params?: Stripe.SubscriptionUpdateParams,
-    metadata?: Stripe.Metadata
+    params?: Stripe.SubscriptionUpdateParams
   ) {
     if (params?.metadata) {
       const newMetadata = params.metadata;
       Object.keys(newMetadata).forEach((key) => {
         if (
-          !Object.values(STRIPE_CUSTOMER_METADATA).includes(
-            key as STRIPE_CUSTOMER_METADATA
+          !Object.values(STRIPE_SUBSCRIPTION_METADATA).includes(
+            key as STRIPE_SUBSCRIPTION_METADATA
           )
         ) {
           throw new Error(`Invalid metadata key: ${key}`);
         }
       });
-      params.metadata = { ...params.metadata, ...metadata };
     }
     return this.stripeClient.subscriptionsUpdate(subscriptionId, params);
   }

diff --git a/libs/payments/customer/src/lib/types.ts b/libs/payments/customer/src/lib/types.ts
@@ -32,7 +32,6 @@ export interface TaxAmount {
 
 export enum STRIPE_CUSTOMER_METADATA {
   PaypalAgreement = 'paypalAgreementId',
-  SubscriptionPromotionCode = 'appliedPromotionCode',
 }
 
 export enum STRIPE_PRICE_METADATA {
@@ -48,6 +47,7 @@ export enum STRIPE_PRODUCT_METADATA {
 export enum STRIPE_SUBSCRIPTION_METADATA {
   Currency = 'currency',
   Amount = 'amount',
+  SubscriptionPromotionCode = 'appliedPromotionCode',
 }
 
 export enum STRIPE_INVOICE_METADATA {