fix: remove premium add-on check (#1740)

* fix: remove premium add-on check * fix: don't filter all payment requests
getlago · Sep 18, 2024 · f290f3c · f290f3c
1 parent 8e9b2b5
commit f290f3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 67 deletions.
diff --git a/src/components/customers/overview/CustomerOverview.tsx b/src/components/customers/overview/CustomerOverview.tsx
@@ -30,7 +30,7 @@ gql`
     $currency: CurrencyEnum
     $expireCache: Boolean
   ) {
-    paymentRequests {
+    paymentRequests(externalCustomerId: $externalCustomerId) {
       collection {
         createdAt
       }

diff --git a/src/generated/graphql.tsx b/src/generated/graphql.tsx
@@ -2520,7 +2520,6 @@ export enum IntegrationItemTypeEnum {
 
 export enum IntegrationTypeEnum {
   Anrok = 'anrok',
-  Dunning = 'dunning',
   Hubspot = 'hubspot',
   Netsuite = 'netsuite',
   Okta = 'okta',
@@ -3891,7 +3890,6 @@ export type PlanOverridesInput = {
 };
 
 export enum PremiumIntegrationTypeEnum {
-  Dunning = 'dunning',
   Hubspot = 'hubspot',
   Netsuite = 'netsuite',
   Okta = 'okta',
@@ -7576,11 +7574,6 @@ export type InvoicesForRequestOverduePaymentFormFragment = { __typename?: 'Invoi
 
 export type LastPaymentRequestFragment = { __typename?: 'PaymentRequest', createdAt: any };
 
-export type GetRequestOverduePaymentAccessQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetRequestOverduePaymentAccessQuery = { __typename?: 'Query', organization?: { __typename?: 'CurrentOrganization', premiumIntegrations: Array<PremiumIntegrationTypeEnum> } | null };
-
 export type GetRequestOverduePaymentInfosQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -12569,7 +12562,7 @@ export type RemoveCouponMutationResult = Apollo.MutationResult<RemoveCouponMutat
 export type RemoveCouponMutationOptions = Apollo.BaseMutationOptions<RemoveCouponMutation, RemoveCouponMutationVariables>;
 export const GetCustomerOverdueBalancesDocument = gql`
     query getCustomerOverdueBalances($externalCustomerId: String!, $currency: CurrencyEnum, $expireCache: Boolean) {
-  paymentRequests {
+  paymentRequests(externalCustomerId: $externalCustomerId) {
     collection {
       createdAt
     }
@@ -19726,45 +19719,6 @@ export type GetCustomerInfosForDraftInvoicesListQueryHookResult = ReturnType<typ
 export type GetCustomerInfosForDraftInvoicesListLazyQueryHookResult = ReturnType<typeof useGetCustomerInfosForDraftInvoicesListLazyQuery>;
 export type GetCustomerInfosForDraftInvoicesListSuspenseQueryHookResult = ReturnType<typeof useGetCustomerInfosForDraftInvoicesListSuspenseQuery>;
 export type GetCustomerInfosForDraftInvoicesListQueryResult = Apollo.QueryResult<GetCustomerInfosForDraftInvoicesListQuery, GetCustomerInfosForDraftInvoicesListQueryVariables>;
-export const GetRequestOverduePaymentAccessDocument = gql`
-    query getRequestOverduePaymentAccess {
-  organization {
-    premiumIntegrations
-  }
-}
-    `;
-
-/**
- * __useGetRequestOverduePaymentAccessQuery__
- *
- * To run a query within a React component, call `useGetRequestOverduePaymentAccessQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetRequestOverduePaymentAccessQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetRequestOverduePaymentAccessQuery({
- *   variables: {
- *   },
- * });
- */
-export function useGetRequestOverduePaymentAccessQuery(baseOptions?: Apollo.QueryHookOptions<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>(GetRequestOverduePaymentAccessDocument, options);
-      }
-export function useGetRequestOverduePaymentAccessLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>(GetRequestOverduePaymentAccessDocument, options);
-        }
-export function useGetRequestOverduePaymentAccessSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useSuspenseQuery<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>(GetRequestOverduePaymentAccessDocument, options);
-        }
-export type GetRequestOverduePaymentAccessQueryHookResult = ReturnType<typeof useGetRequestOverduePaymentAccessQuery>;
-export type GetRequestOverduePaymentAccessLazyQueryHookResult = ReturnType<typeof useGetRequestOverduePaymentAccessLazyQuery>;
-export type GetRequestOverduePaymentAccessSuspenseQueryHookResult = ReturnType<typeof useGetRequestOverduePaymentAccessSuspenseQuery>;
-export type GetRequestOverduePaymentAccessQueryResult = Apollo.QueryResult<GetRequestOverduePaymentAccessQuery, GetRequestOverduePaymentAccessQueryVariables>;
 export const GetRequestOverduePaymentInfosDocument = gql`
     query getRequestOverduePaymentInfos($id: ID!) {
   organization {

diff --git a/src/pages/CustomerRequestOverduePayment/index.tsx b/src/pages/CustomerRequestOverduePayment/index.tsx
@@ -20,12 +20,11 @@ import {
   LagoApiError,
   LastPaymentRequestFragmentDoc,
   OrganizationForRequestOverduePaymentEmailFragmentDoc,
-  PremiumIntegrationTypeEnum,
   useCreatePaymentRequestMutation,
-  useGetRequestOverduePaymentAccessQuery,
   useGetRequestOverduePaymentInfosQuery,
 } from '~/generated/graphql'
 import { useInternationalization } from '~/hooks/core/useInternationalization'
+import { useCurrentUser } from '~/hooks/useCurrentUser'
 import { EmailPreview } from '~/pages/CustomerRequestOverduePayment/components/EmailPreview'
 import {
   serializeEmails,
@@ -40,11 +39,7 @@ import {
 } from './components/RequestPaymentForm'
 
 gql`
-  query getRequestOverduePaymentAccess {
-    organization {
-      premiumIntegrations
-    }
-  }
+
 
   query getRequestOverduePaymentInfos($id: ID!) {
     organization {
@@ -93,9 +88,7 @@ const CustomerRequestOverduePayment: FC = () => {
   const { translate } = useInternationalization()
   const { customerId } = useParams()
   const navigate = useNavigate()
-
-  const { data: organizationData, loading: organizationLoading } =
-    useGetRequestOverduePaymentAccessQuery()
+  const { isPremium } = useCurrentUser()
 
   const {
     data: { customer, organization, paymentRequests, invoices } = {},
@@ -105,9 +98,7 @@ const CustomerRequestOverduePayment: FC = () => {
     variables: { id: customerId ?? '' },
   })
 
-  const hasDunningIntegration = !!organizationData?.organization?.premiumIntegrations.includes(
-    PremiumIntegrationTypeEnum.Dunning,
-  )
+  const hasDunningIntegration = !!isPremium
 
   const [paymentRequest, paymentRequestStatus] = useCreatePaymentRequestMutation({
     refetchQueries: ['getCustomerOverdueBalances'],
@@ -187,12 +178,6 @@ const CustomerRequestOverduePayment: FC = () => {
     }
   }, [loading, totalAmount])
 
-  // Don't render the page until we have the know if the
-  // organization has access to the feature to avoid glitches
-  if (organizationLoading) {
-    return null
-  }
-
   return (
     <>
       <PageHeader>