bug: multiple adjustments on the customer usage (#1738)

getlago · Sep 17, 2024 · 8e9b2b5 · 8e9b2b5
1 parent 3704927
commit 8e9b2b5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/src/components/subscriptions/SubscriptionCurrentUsageTable.tsx b/src/components/subscriptions/SubscriptionCurrentUsageTable.tsx
@@ -48,6 +48,10 @@ gql`
         name
         code
       }
+      customer {
+        id
+        applicableTimezone
+      }
     }
   }
 
@@ -107,6 +111,7 @@ export const SubscriptionCurrentUsageTable = ({
     error: customerError,
   } = useCustomerForSubscriptionUsageQuery({
     variables: { customerId },
+    skip: !customerId,
   })
 
   const {
@@ -126,14 +131,21 @@ export const SubscriptionCurrentUsageTable = ({
     context: {
       silentErrorCodes: [LagoApiError.UnprocessableEntity],
     },
-    variables: { customerId: customerId, subscriptionId: subscription?.id || '' },
+    variables: {
+      customerId: (customerId || subscription?.customer.id) as string,
+      subscriptionId: subscription?.id || '',
+    },
+    skip: !customerId || !subscription,
     // Fixes https://github.com/getlago/lago-front/pull/1243
     fetchPolicy: 'no-cache',
   })
   const currency = usageData?.customerUsage?.currency || CurrencyEnum.Usd
   const isLoading = subscriptionLoading || usageLoading || customerLoading
   const hasError = !!subscriptionError || !!usageError || !!customerError
-  const customerTimezone = customerData?.customer?.applicableTimezone || TimezoneEnum.TzUtc
+  const customerTimezone =
+    customerData?.customer?.applicableTimezone ||
+    subscription?.customer.applicableTimezone ||
+    TimezoneEnum.TzUtc
 
   return (
     <section>
@@ -200,7 +212,7 @@ export const SubscriptionCurrentUsageTable = ({
           ) : (
             <GenericPlaceholder
               title={translate('text_62c3f3fca8a1625624e83379')}
-              subtitle={translate('text_62c3f3fca8a1625624e8337e')}
+              subtitle={translate('text_1726498444629i1fpjyvh0kg')}
               buttonTitle={translate('text_1725983967306qz0npfuhlo1')}
               buttonVariant="primary"
               buttonAction={() => refetchUsage()}
@@ -339,7 +351,9 @@ export const SubscriptionCurrentUsageTable = ({
                 minWidth: 100,
                 content: (row) => (
                   <Typography variant="bodyHl" color="grey700">
-                    {intlFormatNumber(row.amountCents)}
+                    {intlFormatNumber(deserializeAmount(row.amountCents, currency), {
+                      currency,
+                    })}
                   </Typography>
                 ),
               },

diff --git a/src/generated/graphql.tsx b/src/generated/graphql.tsx
@@ -1312,6 +1312,7 @@ export type CreditNote = {
   currency: CurrencyEnum;
   customer: Customer;
   description?: Maybe<Scalars['String']['output']>;
+  errorDetails?: Maybe<Array<ErrorDetail>>;
   externalIntegrationId?: Maybe<Scalars['String']['output']>;
   fileUrl?: Maybe<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
@@ -1326,6 +1327,7 @@ export type CreditNote = {
   refundedAt?: Maybe<Scalars['ISO8601DateTime']['output']>;
   sequentialId: Scalars['ID']['output'];
   subTotalExcludingTaxesAmountCents: Scalars['BigInt']['output'];
+  taxProviderSyncable: Scalars['Boolean']['output'];
   taxesAmountCents: Scalars['BigInt']['output'];
   taxesRate: Scalars['Float']['output'];
   totalAmountCents: Scalars['BigInt']['output'];
@@ -2519,6 +2521,7 @@ export enum IntegrationItemTypeEnum {
 export enum IntegrationTypeEnum {
   Anrok = 'anrok',
   Dunning = 'dunning',
+  Hubspot = 'hubspot',
   Netsuite = 'netsuite',
   Okta = 'okta',
   ProgressiveBilling = 'progressive_billing',
@@ -3022,6 +3025,8 @@ export type Mutation = {
   retryInvoicePayment?: Maybe<Invoice>;
   /** Retry voided invoice sync */
   retryTaxProviderVoiding?: Maybe<Invoice>;
+  /** Retry tax reporting */
+  retryTaxReporting?: Maybe<CreditNote>;
   /** Retry a Webhook */
   retryWebhook?: Maybe<Webhook>;
   /** Revokes an invite */
@@ -3425,6 +3430,11 @@ export type MutationRetryTaxProviderVoidingArgs = {
 };
 
 
+export type MutationRetryTaxReportingArgs = {
+  input: RetryTaxReportingInput;
+};
+
+
 export type MutationRetryWebhookArgs = {
   input: RetryWebhookInput;
 };
@@ -3882,6 +3892,7 @@ export type PlanOverridesInput = {
 
 export enum PremiumIntegrationTypeEnum {
   Dunning = 'dunning',
+  Hubspot = 'hubspot',
   Netsuite = 'netsuite',
   Okta = 'okta',
   ProgressiveBilling = 'progressive_billing',
@@ -4530,6 +4541,13 @@ export type RetryTaxProviderVoidingInput = {
   id: Scalars['ID']['input'];
 };
 
+/** Autogenerated input type of RetryTaxReporting */
+export type RetryTaxReportingInput = {
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['ID']['input'];
+};
+
 /** Autogenerated input type of RetryWebhook */
 export type RetryWebhookInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -7040,7 +7058,7 @@ export type SubscrptionForSubscriptionUsageQueryVariables = Exact<{
 }>;
 
 
-export type SubscrptionForSubscriptionUsageQuery = { __typename?: 'Query', subscription?: { __typename?: 'Subscription', id: string, name?: string | null, plan: { __typename?: 'Plan', id: string, name: string, code: string } } | null };
+export type SubscrptionForSubscriptionUsageQuery = { __typename?: 'Query', subscription?: { __typename?: 'Subscription', id: string, name?: string | null, plan: { __typename?: 'Plan', id: string, name: string, code: string }, customer: { __typename?: 'Customer', id: string, applicableTimezone: TimezoneEnum } } | null };
 
 export type UsageForSubscriptionUsageQueryVariables = Exact<{
   customerId: Scalars['ID']['input'];
@@ -17059,6 +17077,10 @@ export const SubscrptionForSubscriptionUsageDocument = gql`
       name
       code
     }
+    customer {
+      id
+      applicableTimezone
+    }
   }
 }
     `;

diff --git a/translations/base.json b/translations/base.json
@@ -2428,5 +2428,6 @@
   "text_1725983967306c736sdyjohn": "See breakdown",
   "text_1725983967306cei92rkdtvb": "Usage",
   "text_1726044816685r61awuydvji": "Close details",
-  "text_1726158292600r2xetfumq5t": "Item name"
+  "text_1726158292600r2xetfumq5t": "Item name",
+  "text_1726498444629i1fpjyvh0kg": "Please refresh this section or contact us if the error persists."
 }