feat: hold money

Author: nevo-david

apps/backend/src/api/routes/billing.controller.ts

@@ -24,10 +24,10 @@ export class BillingController {
     @Param('id') body: string
   ) {
     return {
-      exists: !!(await this._subscriptionService.checkSubscription(
+      status: await this._stripeService.checkSubscription(
         org.id,
         body
-      )),
+      ),
     };
   }
 
@@ -39,7 +39,7 @@ export class BillingController {
     @Req() req: Request
   ) {
     const uniqueId = req?.cookies?.track;
-    return this._stripeService.subscribe(uniqueId, org.id, user.id, body);
+    return this._stripeService.subscribe(uniqueId, org.id, user.id, body, org.allowTrial);
   }
 
   @Get('/portal')

apps/backend/src/api/routes/users.controller.ts

@@ -68,6 +68,7 @@ export class UsersController {
       isLifetime: !!organization?.subscription?.isLifetime,
       admin: !!user.isSuperAdmin,
       impersonate: !!req.cookies.impersonate,
+      allowTrial: organization?.allowTrial,
       // @ts-ignore
       publicApi: organization?.users[0]?.role === 'SUPERADMIN' || organization?.users[0]?.role === 'ADMIN'
           ? organization?.apiKey

apps/frontend/src/components/billing/main.billing.component.tsx

@@ -481,7 +481,7 @@ export const MainBillingComponent: FC<{
                             .format('D MMM, YYYY')}`
                         : 'Cancel subscription'
                       : // @ts-ignore
-                      user?.tier === 'FREE' || user?.tier?.current === 'FREE'
+                        (user?.tier === 'FREE' || user?.tier?.current === 'FREE') && user.allowTrial
                       ? 'Start 7 days free trial'
                       : 'Purchase'}
                   </Button>

apps/frontend/src/components/layout/check.payment.tsx

@@ -0,0 +1,48 @@
+import { FC, useCallback, useEffect, useState } from 'react';
+import Loading from 'react-loading';
+import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
+import { timer } from '@gitroom/helpers/utils/timer';
+import { useToaster } from '@gitroom/react/toaster/toaster';
+
+export const CheckPayment: FC<{ check: string; mutate: () => void }> = (props) => {
+  const [showLoader, setShowLoader] = useState(true);
+  const fetch = useFetch();
+  const toaster = useToaster();
+
+  const checkSubscription = useCallback(async () => {
+    const {status} = await (await fetch('/billing/check/' + props.check)).json();
+    if (status === 0) {
+      await timer(1000);
+      return checkSubscription();
+    }
+
+    if (status === 1) {
+      toaster.show(
+        'We could not validate your payment method, please try again',
+        'warning'
+      );
+      setShowLoader(false);
+    }
+
+    if (status === 2) {
+      setShowLoader(false);
+      props.mutate();
+    }
+  }, []);
+
+  useEffect(() => {
+    checkSubscription();
+  }, []);
+
+  if (showLoader) {
+    return (
+      <div className="fixed bg-black/40 w-full h-full flex justify-center items-center z-[400]">
+        <div>
+          <Loading type="spin" color="#612AD5" height={250} width={250} />
+        </div>
+      </div>
+    );
+  }
+
+  return null;
+};

apps/frontend/src/components/layout/layout.settings.tsx

@@ -17,6 +17,7 @@ export const UserContext = createContext<
       totalChannels: number;
       isLifetime?: boolean;
       impersonate: boolean;
+      allowTrial: boolean;
     })
 >(undefined);
 

apps/frontend/src/components/layout/user.context.tsx

@@ -131,11 +131,11 @@ module.exports = {
           '100%': { overflow: 'hidden' },
         },
         fadeDown: {
-          '0%': { opacity: 0, transform: 'translateY(-30px)' },
-          '10%': { opacity: 1, transform: 'translateY(0)' },
-          '85%': { opacity: 1, transform: 'translateY(0)' },
-          '90%': { opacity: 1, transform: 'translateY(10px)' },
-          '100%': { opacity: 0, transform: 'translateY(-30px)' },
+          '0%': { opacity: 0, marginTop: -30},
+          '10%': { opacity: 1, marginTop: 0 },
+          '85%': { opacity: 1, marginTop: 0 },
+          '90%': { opacity: 1, marginTop: 10 },
+          '100%': { opacity: 0, marginTop: -30 },
         },
         normalFadeDown: {
           '0%': { opacity: 0, transform: 'translateY(-30px)' },

apps/frontend/tailwind.config.js

@@ -215,6 +215,7 @@ export class OrganizationRepository {
       data: {
         name: body.company,
         apiKey: AuthService.fixedEncryption(makeId(20)),
+        allowTrial: true,
         users: {
           create: {
             role: Role.SUPERADMIN,
@@ -246,6 +247,14 @@ export class OrganizationRepository {
     });
   }
 
+  getOrgByCustomerId(customerId: string) {
+    return this._organization.model.organization.findFirst({
+      where: {
+        paymentId: customerId,
+      },
+    });
+  }
+
   async getTeam(orgId: string) {
     return this._organization.model.organization.findUnique({
       where: {

libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts

@@ -60,6 +60,10 @@ export class OrganizationService {
     return this._organizationRepository.getTeam(orgId);
   }
 
+  getOrgByCustomerId(customerId: string) {
+    return this._organizationRepository.getOrgByCustomerId(customerId);
+  }
+
   async inviteTeamMember(orgId: string, body: AddTeamMemberDto) {
     const timeLimit = dayjs().add(1, 'hour').format('YYYY-MM-DD HH:mm:ss');
     const id = makeId(5);

libraries/nestjs-libraries/src/database/prisma/organizations/organization.service.ts

@@ -25,6 +25,7 @@ model Organization {
   Integration       Integration[]
   post              Post[] @relation("organization")
   submittedPost     Post[] @relation("submittedForOrg")
+  allowTrial        Boolean            @default(false)
   Comments          Comments[]
   notifications     Notifications[]
   buyerOrganization MessagesGroup[]