Merge pull request #9 from tierrun/intellisense

Adding type to payment method and upgraded Prisma

Author: jerriclynsjohn

README.md

@@ -55,7 +55,8 @@ npm run dev
 
 - Prod - https://model.tier.run/clkkv3fv93bbko972m4w3x9o8
 - Staging - https://model.tier.run/clkkurlas3a4qo9725bj1hfr0
-- Dev - https://model.tier.run/clkk2dgjs30kdo972fptgizyx
+- Dev - https://model.tier.run/edit/cll0j0ya64mrao972ccqueu7i
+- Dev (New Model) - https://model.tier.run/clkk2dgjs30kdo972fptgizyx
 
 You can clone the pricing model from the above links and make it your own.
 

package-lock.json

@@ -18,7 +18,7 @@
     "@headlessui/react": "^1.7.15",
     "@heroicons/react": "^2.0.18",
     "@next-auth/prisma-adapter": "^1.0.7",
-    "@prisma/client": "^5.0.0",
+    "@prisma/client": "^5.1.1",
     "@radix-ui/react-toast": "^1.1.4",
     "@t3-oss/env-nextjs": "^0.6.0",
     "ai": "^2.1.26",
@@ -62,7 +62,7 @@
     "prettier": "^2.8.8",
     "prettier-plugin-tailwindcss": "^0.3.0",
     "pretty-quick": "^3.1.3",
-    "prisma": "^5.0.0",
+    "prisma": "^5.1.1",
     "stripe": "^12.17.0",
     "tailwindcss": "^3.3.2",
     "tailwindcss-animate": "^1.0.6",

package.json

@@ -1,5 +1,6 @@
 import { Metadata } from "next";
 import { clsx } from "clsx";
+import type Stripe from "stripe";
 
 import { TIER_AICOPY_FEATURE_ID } from "@/config/tierConstants";
 import { pullCurrentPlan } from "@/lib/services/currentPlan";
@@ -34,6 +35,7 @@ export default async function BillingPage() {
 
   // Fetch the phase data of the current subscription
   const phase = await tier.lookupPhase(`org:${user?.id}`);
+  console.log(phase.current?.end);
 
   // Fetch the current plan from the pricing table data
   const currentPlan = await pullCurrentPlan(phase, pricing);
@@ -44,7 +46,7 @@ export default async function BillingPage() {
   // Fetch the saved payment methods
   const paymentMethodResponse = await tier.lookupPaymentMethods(`org:${user?.id}`);
 
-  const paymentMethod = paymentMethodResponse.methods[0];
+  const paymentMethod = paymentMethodResponse.methods[0] as unknown as Stripe.PaymentMethod;
 
   return (
     <>
@@ -213,7 +215,7 @@ export default async function BillingPage() {
             </div>
           )}
           {/* Payment method */}
-          {paymentMethod && (
+          {paymentMethod && paymentMethod.card && (
             <div className="flex items-start gap-16">
               <p className="text-slate-11">Payment method</p>
               <div className="flex gap-4">

src/app/(app)/billing/page.tsx

@@ -1,15 +1,15 @@
 {
   "compilerOptions": {
-    "target": "es2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "target": "ES2017",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
+    "module": "ESNext",
+    "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",