fix: use withholding tax amount directly from eventpop

Author: rayriffy

app.ts

@@ -4,6 +4,7 @@ import { parse } from "csv-parse/sync";
 import fs from "fs";
 import { DateTime } from "luxon";
 import { execSync } from 'child_process';
+import { isEmpty } from 'lodash'
 
 import { createInvoice } from "./createInvoice";
 import { createPayment } from "./createPayment";
@@ -46,10 +47,10 @@ const processedData: ProcessedData[] = (orders as Order[])
         return {
             eventpopId: item['Order #'],
             customer: {
-                name: item["Buyer Name"],
+                name: taxInfo?.["Billing Name"] ?? item["Buyer Name"],
                 taxId: taxInfo?.["Billing Tax ID"] ?? null,
                 address: taxInfo?.["Billing Address"] ?? null,
-                branch: 'สำนักงานใหญ่',
+                branch: taxInfo?.["Billing Branch"] ?? 'สำนักงานใหญ่',
                 email: orderWithEmail[item['Order #']]
             },
             ticket: {
@@ -66,9 +67,9 @@ const processedData: ProcessedData[] = (orders as Order[])
                         zone: 'Asia/Bangkok',
                         setZone: true,
                     }
-                ).toISO()!).toISOString()
+                ).toISO()!).toISOString(),
+                witholdingTax: Number(item["Withholding Tax"]) > 0 ? Number(item["Withholding Tax"]) : null
             },
-            isWitholdingTax: Number(item["Withholding Tax"]) > 0
         } satisfies ProcessedData
     })
 
@@ -85,13 +86,13 @@ const pickedData = processedData
         "#38704-3267295", // bank, tax
         "#38704-3225968", // credit
         "#38704-3215101", // bank,
-        "#38704-3288940", // out of scope
+        "#38704-3288940", // out of scope,
+        "#38704-3251019", // company
+        "#38704-3215560"   // company
 
     ].includes(o.eventpopId)
 )
 
-console.log(pickedData)
-
 ;(async () => {
     let index = 1
     for await (const item of pickedData) {

createPayment.ts

@@ -13,13 +13,13 @@ export const createPayment = (data: ProcessedData, recordId: number) => {
     }
 
     const totalPrice = data.ticket.price * data.ticket.amount
-    const withheldAmount = Number(((data.isWitholdingTax ? 0.0279 : 0) * totalPrice).toFixed(2))
+    const withheldAmount = data.payment.witholdingTax !== null ? data.payment.witholdingTax : 0
     const actualPriceAfterDeductWithheld = totalPrice - withheldAmount
 
     let payload = {
         "dateNow": data.payment.method === 'bank' ? dayjs(data.payment.when).add(7, 'h').toISOString() : creditCardBilledDate,
         "chequeDate": data.payment.method === 'bank' ? dayjs(data.payment.when).add(7, 'h').toISOString() : creditCardBilledDate,
-        "withholdingTax": data.isWitholdingTax ? 3 : null,
+        "withholdingTax": data.payment.witholdingTax !== null ? 3 : null,
         "amountWithheld": withheldAmount,
         "charge": 0,
         "paymentMethod": data.payment.method === "bank" ? 5 : 13,

package.json

@@ -14,9 +14,11 @@
     "csv-parse": "5.5.6",
     "dayjs": "1.11.13",
     "dotenv": "16.4.5",
+    "lodash": "^4.17.21",
     "luxon": "3.5.0"
   },
   "devDependencies": {
+    "@types/lodash": "^4.17.7",
     "@types/luxon": "3.4.2",
     "@types/node": "22.5.4",
     "tsx": "^4.19.0",

pnpm-lock.yaml

@@ -48,6 +48,7 @@ export interface Order {
     payment: {
         method: 'bank' | 'credit'
         when: string // ISO timestamp
+        witholdingTax: number | null
     }
     customer: {
         name: string
@@ -56,5 +57,4 @@ export interface Order {
         branch: string
         email: string
     }
-    isWitholdingTax: boolean
 }