chore: wip

Author: glennmichael123

app/Actions/Payment/FetchTransactionHistoryAction.ts

@@ -10,7 +10,7 @@ export default new Action({
     const userId = Number(request.getParam('id'))
     const user = await User.find(userId)
 
-    const transactions = await user?.subscriptionHistory()
+    const transactions = await user?.transactionHistory()
 
     return transactions
   },

resources/views/dashboard/components/billing/one-time-payment.vue

@@ -4,7 +4,8 @@ import { useBillable } from '../../../../functions/billing/payments'
 import PaymentForm from './payment-form.vue'
 
 interface Props {
-  product: number
+  product: number,
+  paymentIntent: string,
 }
 
 const props = defineProps<Props>()
@@ -39,6 +40,6 @@ onMounted(async () => {
         </div>
       </li>
     </ul>
-    <PaymentForm :product-id="1" :price="unitPrice" class="w-2/3" />
+    <PaymentForm :paymentIntent="props.paymentIntent" :product-id="1" :price="unitPrice" class="w-2/3" />
   </div>
 </template>

resources/views/dashboard/components/billing/payment-form.vue

@@ -3,7 +3,8 @@ import { useBillable } from '../../../../functions/billing/payments'
 
 interface Props {
   productId: number
-  price: string
+  price: string,
+  paymentIntent: string,
 }
 
 const props = defineProps<Props>()
@@ -13,12 +14,9 @@ const { loadPaymentForm, handlePayment } = useBillable()
 const paymentStore = usePaymentStore()
 
 const element = ref(null as any)
-let clientSecret: string
 
 onMounted(async () => {
-  clientSecret = await paymentStore.fetchPaymentIntent(1, props.productId)
-
-  element.value = await loadPaymentForm(clientSecret)
+  element.value = await loadPaymentForm(props.paymentIntent)
 })
 
 async function pay() {

resources/views/dashboard/settings/billing.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
 import { useBillable } from '../../../functions/billing/payments'
 
-// import ActivePlan from '../components/billing/active-plan.vue'
+import ActivePlan from '../components/billing/active-plan.vue'
 
-// import PaymentMethod from '../components/billing/payment-method.vue'
-// import Plans from '../components/billing/plans.vue'
+import PaymentMethod from '../components/billing/payment-method.vue'
+import Plans from '../components/billing/plans.vue'
 
-// import LoadingDetails from '../components/skeleton/loading-card.vue'
-// import TransactionHistory from '../components/transaction/index.vue'
-
-import OneTimePayment from '../components/billing/one-time-payment.vue'
+import LoadingDetails from '../components/skeleton/loading-card.vue'
+import TransactionHistory from '../components/transaction/index.vue'
 
 const { isEmpty, showCurrentPlan } = useBillable()
 
@@ -28,7 +26,7 @@ onMounted(async () => {
 
 <template>
   <div class="mx-auto px-4 py-8 container lg:px-8">
-    <!-- <div id="subscribed">
+    <div id="subscribed">
       <TransactionHistory />
       <div class="flex space-x-8">
         <div class="mt-16 w-2/3 bg-white px-8 py-6 shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg">
@@ -40,8 +38,6 @@ onMounted(async () => {
         </div>
         <PaymentMethod />
       </div>
-    </div> -->
-
-    <OneTimePayment :product="1" />
+    </div>
   </div>
 </template>

storage/framework/core/orm/src/utils.ts

@@ -1278,7 +1278,6 @@ export async function generateModelString(
       return updatedPaymentMethod
     }
 
-
     async deletePaymentMethod(paymentMethodId: number): Promise<Stripe.Response<Stripe.PaymentMethod>> {
       const deletedPaymentMethod = await managePaymentMethod.deletePaymentMethod(this, paymentMethodId)
       return deletedPaymentMethod
@@ -1316,6 +1315,10 @@ export async function generateModelString(
       return manageInvoice.list(this)
     }
 
+    async transactionHistory(): Promise<TransactionModel[]> {
+      return manageTransaction.list(this)
+    }
+
     async stripeSubscriptions(): Promise<Stripe.Response<Stripe.ApiList<Stripe.Invoice>>> {
       return manageInvoice.list(this)
     }

storage/framework/core/payments/src/billable/transaction.ts

@@ -25,5 +25,11 @@ export const manageTransaction: ManageTransaction = (() => {
     return transaction
   }
 
-  return { store }
+  async function list(user: UserModel): Promise<TransactionModel[]> {
+    const transaction = await Transaction.where('user_id', user.id).get()
+
+    return transaction
+  }
+
+  return { store, list }
 })()

storage/framework/orm/src/models/User.ts

@@ -948,6 +948,10 @@ export class UserModel {
     return manageInvoice.list(this)
   }
 
+  async transactionHistory(): Promise<TransactionModel[]> {
+    return manageTransaction.list(this)
+  }
+
   async stripeSubscriptions(): Promise<Stripe.Response<Stripe.ApiList<Stripe.Invoice>>> {
     return manageInvoice.list(this)
   }