Handles zero-amount payment flows seamlessly

Updates payment processing logic to bypass external API calls for free orders and ensures completion status for zero-amount carts.
Improves reliability by supporting free transactions without unnecessary external requests.

Author: aggre

src/Pay.vue

@@ -156,6 +156,7 @@ const waitForCompleted = async () => {
             const body = await result.json()
             const items = body.data as CartItem[]
             if (
+              items.length > 0 &&
               items.every((item) => item.status === CartItemStatus.Completed)
             ) {
               clearInterval(polling)
@@ -307,29 +308,31 @@ const clickHandler = async () => {
   })
 
   const pay = await whenNotError(paymentKey, (key) =>
-    new Promise<{}>((resolve, reject) => {
-      pop.pay(key, {
-        skipOrderSummary: true,
-        autoReturn: true,
-        language: 'en', //'en' | 'ja' | 'zh'
-        onSuccess: function (result: any) {
-          console.log('success')
-          console.log(result)
-          waitingForCompleted.value = true
-          return resolve(result as {})
-        },
-        onFailure: function (result: any) {
-          console.log('failure')
-          console.log(result)
-          return reject(new Error(`${result.result_code}: ${result.status}`))
-        },
-        onIncomplete: function (result: any) {
-          console.log('incomplete')
-          console.log(result)
-          return reject(new Error(`${result.status}`))
-        },
-      })
-    }).catch((err: Error) => err),
+    whenDefined(key, (_key) =>
+      new Promise<{}>((resolve, reject) => {
+        pop.pay(_key, {
+          skipOrderSummary: true,
+          autoReturn: true,
+          language: 'en', //'en' | 'ja' | 'zh'
+          onSuccess: function (result: any) {
+            console.log('success')
+            console.log(result)
+            waitingForCompleted.value = true
+            return resolve(result as {})
+          },
+          onFailure: function (result: any) {
+            console.log('failure')
+            console.log(result)
+            return reject(new Error(`${result.result_code}: ${result.status}`))
+          },
+          onIncomplete: function (result: any) {
+            console.log('incomplete')
+            console.log(result)
+            return reject(new Error(`${result.status}`))
+          },
+        })
+      }).catch((err: Error) => err),
+    ),
   )
 
   whenDefined(dialog.value, (dia) => {

src/api/payment-cart-key.ts

@@ -1,5 +1,5 @@
 import type { APIRoute } from 'astro'
-import { whenNotError, whenNotErrorAll } from '@devprotocol/util-ts'
+import { isNotError, whenNotError, whenNotErrorAll } from '@devprotocol/util-ts'
 import {
   bytes32Hex,
   type ClubsConfiguration,
@@ -12,6 +12,7 @@ import { verify } from '../utils/account'
 import { getCart } from '../db/cart'
 import { generateFulFillmentCartParamsId } from '../utils/gen-key'
 import { randomHash } from '../utils/hash'
+import { complete } from '../fixtures/fulfillment/cart'
 
 /**
  * This endpoint is expected to be called with the following parameters:
@@ -137,5 +138,14 @@ export const getPaymentKeyByCart: ({
 
     console.log({ options })
 
-    return callNRes(options)
+    const [res] = await Promise.all([
+      callNRes(options),
+      isNotError(options) && options.gross_amount === 0
+        ? whenNotErrorAll([eoa, options], ([_eoa, { order_id }]) =>
+            complete({ scope, eoa: _eoa, order_id, config }),
+          )
+        : Promise.resolve(),
+    ])
+
+    return res
   }

src/api/payment-key.ts

@@ -14,6 +14,7 @@ import type { ComposedItem } from '../types'
 import {
   ErrorOr,
   isNotError,
+  whenDefined,
   whenDefinedAll,
   whenNotError,
   whenNotErrorAll,
@@ -33,14 +34,15 @@ const { POP_SERVER_KEY, REDIS_URL, REDIS_USERNAME, REDIS_PASSWORD } =
 export const AUTH_STRING = Buffer.from(`${POP_SERVER_KEY}:`).toString('base64')
 
 export type Success = {
-  payment_key: string // '28GTzdVOZNeImaHMDeQF1319'
-  result_code: string //'R000'
+  payment_key?: string // '28GTzdVOZNeImaHMDeQF1319'
+  result_code?: string //'R000'
   status: 'success'
-  message: string //'"Payment Key" has been generated successfully'
-  payment_key_expiry_time: string //'20200401000000'
+  message?: string //'"Payment Key" has been generated successfully'
+  payment_key_expiry_time?: string //'20200401000000'
   _clubs: {
     // Injected by CLUBS
     order_id: string // 'ORDER-<UUID>'
+    gross_amount: number
   }
 }
 
@@ -122,24 +124,36 @@ export type PaymentKeyOptions = {
 }
 
 export const callNRes = async (options: ErrorOr<PaymentKeyOptions>) => {
-  const paymentKey = await whenNotError(options, (opts) =>
-    fetch('https://pay3.veritrans.co.jp/pop/v1/payment-key', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-        Authorization: `Basic ${AUTH_STRING}`,
-      },
-      body: JSON.stringify(opts),
-    }).catch((err) => new Error(err)),
+  const isFree = whenNotError(options, (opts) => opts.gross_amount === 0)
+  const paymentKey = await whenNotErrorAll([options, isFree], ([opts, free]) =>
+    free
+      ? undefined
+      : fetch('https://pay3.veritrans.co.jp/pop/v1/payment-key', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json; charset=utf-8',
+            Authorization: `Basic ${AUTH_STRING}`,
+          },
+          body: JSON.stringify(opts),
+        }).catch((err) => new Error(err)),
   )
 
   const result = await whenNotErrorAll(
     [paymentKey, options],
     ([res, { order_id }]) =>
-      res
-        .json()
-        .then((x) => ({ ...x, _clubs: { order_id } }) as Success)
-        .catch((err) => new Error(err)),
+      whenDefined(res, (_res) =>
+        _res
+          .json()
+          .then(
+            (x) =>
+              ({
+                ...x,
+                _clubs: { order_id, gross_amount: x.gross_amount },
+              }) as Success,
+          )
+          .catch((err) => new Error(err)),
+      ) ??
+      ({ status: 'success', _clubs: { order_id, gross_amount: 0 } } as Success),
   )
 
   return result instanceof Error