Update for Subscription Handling

FalkWolsky · FalkWolsky · commit b6e19ee7c0f3 · 2024-08-12T14:02:58.000+02:00
diff --git a/client/packages/lowcoder/src/api/subscriptionApi.ts b/client/packages/lowcoder/src/api/subscriptionApi.ts
@@ -10,7 +10,7 @@ export interface CustomerAddress {
   postalCode: string;
 }
 
-export interface Customer {
+export interface LowcoderCustomer {
   hostname: string;
   email: string;
   orgId: string;
@@ -21,6 +21,37 @@ export interface Customer {
   address?: CustomerAddress;
 }
 
+interface LowcoderMetadata {
+  lowcoder_host: string;
+  lowcoder_orgId: string;
+  lowcoder_type: string;
+  lowcoder_userId: string;
+}
+
+export interface StripeCustomer {
+  id: string;
+  object: string;
+  address?: object | null;
+  balance: number;
+  created: number;
+  currency: string | null;
+  default_source: string | null;
+  delinquent: boolean;
+  description: string | null;
+  discount: string | null;
+  email: string;
+  invoice_prefix: string;
+  invoice_settings: object | null;
+  livemode: boolean;
+  metadata: LowcoderMetadata;
+  name: string;
+  phone: string | null;
+  preferred_locales: string[];
+  shipping: string | null;
+  tax_exempt: string;
+  test_clock: string | null;
+}
+
 export type ResponseType = {
   response: any;
 };
diff --git a/client/packages/lowcoder/src/pages/setting/subscriptions/index.tsx b/client/packages/lowcoder/src/pages/setting/subscriptions/index.tsx
@@ -8,8 +8,6 @@ export const Subscription = () => {
 
   const location = useLocation();
 
-  console.log("Current location:", location.pathname);
-
   return (
     <Switch>
       <Route path={SUBSCRIPTION_SETTING} component={SubscriptionSetting} exact />
diff --git a/client/packages/lowcoder/src/pages/setting/subscriptions/productCard.tsx b/client/packages/lowcoder/src/pages/setting/subscriptions/productCard.tsx
@@ -1,9 +1,8 @@
-// productCard.tsx
 import React from 'react';
 import styled from 'styled-components';
 import { GreyTextColor } from 'constants/style';
 import { Card } from 'antd';
-import { SettingOutlined, CheckCircleOutlined, PlusSquareOutlined } from '@ant-design/icons';
+import { SettingOutlined, CheckCircleOutlined, PlusSquareOutlined, LoadingOutlined, InfoCircleOutlined } from '@ant-design/icons';
 import { buildSubscriptionId } from "constants/routesURL";
 import history from "util/history";
 
@@ -53,7 +52,9 @@ interface ProductCardProps {
   pricingType: string;
   pricing: Pricing[];
   activeSubscription: boolean;
-  accessLink: string;
+  checkoutLink: string;
+  checkoutLinkDataLoaded?: boolean;
+  subscriptionId: string;
 }
 
 export const ProductCard: React.FC<ProductCardProps> = ({
@@ -63,23 +64,43 @@ export const ProductCard: React.FC<ProductCardProps> = ({
   pricingType,
   pricing,
   activeSubscription,
-  accessLink
+  checkoutLink,
+  checkoutLinkDataLoaded,
+  subscriptionId
 }) => {
 
-  const handleClick = () => {
-    history.push(buildSubscriptionId(accessLink));
+  const goToCheckout = () => {
+    if (checkoutLink) {
+      window.open(checkoutLink, '_blank');
+    }
+  };
+
+  const goToSubscriptionSettings = () => {
+    history.push(buildSubscriptionId(subscriptionId));
+  };
+
+  const goToSubscriptionInformation = () => {
+    // history.push(buildSubscriptionId(subscriptionId));
   };
 
   return (
     <ProductCardContainer
       hoverable
       cover={<img alt={title} src={image} />}
       actions={[
-        <SettingOutlined key="setting" onClick={handleClick} />,
+        activeSubscription ? (
+          <SettingOutlined key="setting" onClick={goToSubscriptionSettings} />
+        ) : (
+          <InfoCircleOutlined key="setting" onClick={goToSubscriptionInformation} />
+        ),
         activeSubscription ? (
           <CheckCircleOutlined key="check" style={{ color: 'green' }} />
         ) : (
-          <PlusSquareOutlined key="add" style={{ color: 'blue' }} />
+          checkoutLinkDataLoaded ? (
+            <PlusSquareOutlined key="add" style={{ color: 'blue'}} onClick={goToCheckout}/>
+          ) : (
+            <LoadingOutlined key="wait" />
+          )
         )
       ]}
     >
diff --git a/client/packages/lowcoder/src/pages/setting/subscriptions/subscriptionSetting.tsx b/client/packages/lowcoder/src/pages/setting/subscriptions/subscriptionSetting.tsx
