fix: fix refunds

packages/api/package.json

@@ -50,9 +50,9 @@
     "@fastify/cors": "^9.0.1",
     "@fastify/middie": "8.3.1",
     "@fastify/static": "7.0.4",
-    "@modular-api/api": "^0.4.17",
+    "@modular-api/api": "^0.4.19",
     "@modular-api/fastify-cart": "^0.2.4",
-    "@modular-api/fastify-checkout": "^0.3.7",
+    "@modular-api/fastify-checkout": "^0.3.9",
     "@modular-api/fastify-oidc": "^0.5.4",
     "@mollie/api-client": "^3.7.0",
     "@slimfact/app": "^0.1.0",

packages/api/src/pgboss.ts

@@ -2,6 +2,7 @@ import PgBoss, { Job } from 'pg-boss'
 import { db, postgresConnectionString } from '../src/kysely/index.js'
 import { InvoiceStatus, RawNewInvoice } from '@modular-api/fastify-checkout'
 import { FastifyInstance } from 'fastify'
+import { RefundStatus } from '@modular-api/fastify-checkout/types'
 
 let boss: PgBoss
 const createSubscriptionWorker = ({ fastify }: { fastify: FastifyInstance }) =>
@@ -16,6 +17,27 @@ const createSubscriptionWorker = ({ fastify }: { fastify: FastifyInstance }) =>
     return true
   }
 
+const createRefundWorker = ({ fastify }: { fastify: FastifyInstance }) =>
+  async function refundWorker() {
+    const refunds = await db
+      .selectFrom('checkout.refunds')
+      .where((web) =>
+        web.or([
+          web('status', '=', RefundStatus.PENDING),
+          web('status', '=', RefundStatus.PROCESSING),
+          web('status', '=', RefundStatus.QUEUED)
+        ])
+      )
+      .select('id')
+      .execute()
+
+    for (const refund of refunds) {
+      await fastify.checkout?.paymentHandlers?.mollie?.getRefund({
+        id: refund.id
+      })
+    }
+  }
+
 export const initialize = async ({ fastify }: { fastify: FastifyInstance }) => {
   boss = new PgBoss(postgresConnectionString)
 
@@ -34,6 +56,21 @@ export const initialize = async ({ fastify }: { fastify: FastifyInstance }) => {
         subscriptionWorker
       )
     })
+
+  const refundWorker = createRefundWorker({ fastify })
+  await boss.work(
+    'checkRefunds',
+    { batchSize: 1, includeMetadata: true },
+    refundWorker
+  )
+  if (!schedules.some((schedule) => schedule.name === 'checkRefunds')) {
+    const queueName = `checkRefunds`
+
+    if (!(await boss.getQueue(queueName))) {
+      await boss.createQueue(queueName)
+    }
+    await boss.schedule(queueName, '0 0 * * *', {}, {})
+  }
   // await boss.work(
   //   'subscription:*',
   //   { batchSize: 1, includeMetadata: true },

packages/app/package.json

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@modular-api/fastify-cart": "^0.2.4",
     "@modular-api/fastify-checkout": "^0.3.3",
-    "@modular-api/quasar-components": "^0.2.10",
+    "@modular-api/quasar-components": "^0.2.11",
     "@quasar/extras": "1.16.11",
     "@quasar/quasar-ui-qcalendar": "4.0.0-beta.16",
     "@simsustech/quasar-components": "^0.10.3",

packages/app/src/components/invoice/InvoiceExpansionItem.vue

@@ -344,6 +344,11 @@
         name="payments"
         :label="lang.payment.payments"
       />
+      <q-tab
+        v-if="modelValue.refunds?.length"
+        name="refunds"
+        :label="lang.refund.refunds"
+      />
     </q-tabs>
 
     <q-separator />
@@ -396,6 +401,15 @@
           />
         </q-list>
       </q-tab-panel>
+      <q-tab-panel v-if="modelValue.refunds?.length" name="refunds">
+        <q-list>
+          <refund-item
+            v-for="refund in modelValue.refunds"
+            :key="refund.id"
+            :model-value="refund"
+          />
+        </q-list>
+      </q-tab-panel>
     </q-tab-panels>
 
     <!-- <q-scroll-area :style="scrollAreaSize">
@@ -417,7 +431,8 @@ import Price from '../Price.vue'
 import {
   InvoiceLineRow,
   InvoiceDiscountSurchargeRow,
-  PaymentItem
+  PaymentItem,
+  RefundItem
 } from '@modular-api/quasar-components/checkout'
 import { computed, ref, toRefs } from 'vue'
 import { useQuasar } from 'quasar'

packages/app/src/lang/en-US.ts

@@ -217,7 +217,12 @@ const lang: Language = {
     }
   },
   refund: {
-    refund: 'Refund'
+    refund: 'Refund',
+    refunds: 'Refunds',
+    messages: {
+      confirmRefund: (amount) =>
+        `Are you sure you want to refund the amount of ${amount}?`
+    }
   }
 }
 

packages/app/src/lang/index.ts

@@ -241,6 +241,10 @@ export interface Language {
   }
   refund: {
     refund: string
+    refunds: string
+    messages: {
+      confirmRefund: (amount: number | string) => string
+    }
   }
 }
 

packages/app/src/lang/nl.ts

@@ -219,7 +219,12 @@ const lang: Language = {
     }
   },
   refund: {
-    refund: 'Terugbetaling'
+    refund: 'Terugbetaling',
+    refunds: 'Terugbetalingen',
+    messages: {
+      confirmRefund: (amount) =>
+        `Weet u zeker dat u een terugbetaling t.w.v. ${amount} wil doen?`
+    }
   }
 }
 

packages/app/src/pages/InvoicePage.vue

@@ -295,15 +295,24 @@ const payWithSmartpin = async () => {
 }
 
 const refund = async () => {
-  if (invoice.value) {
-    const result = useMutation('admin.refundInvoice', {
-      args: {
-        id: invoice.value.id
-      },
-      immediate: true
+  if (invoice.value?.amountDue && invoice.value.amountDue < 0) {
+    $q.dialog({
+      message: lang.value.refund.messages.confirmRefund(
+        format(-invoice.value.amountDue)
+      ),
+      cancel: true
+    }).onOk(async () => {
+      if (invoice.value?.id) {
+        const result = useMutation('admin.refundInvoice', {
+          args: {
+            id: invoice.value.id
+          },
+          immediate: true
+        })
+
+        await result.immediatePromise
+      }
     })
-
-    await result.immediatePromise
   }
 }