promptpay-qrcode 1.2.0 → 1.2.1

package/README.md

@@ -65,9 +65,17 @@ generateBillPayment({
   dynamic: true,               // optional; force POI (true='12', false='11')
   merchantName: 'MY SHOP',     // optional (tag 59)
   merchantCity: 'BANGKOK',     // optional (tag 60)
+  additionalData: '07160000…', // optional raw tag 62 (e.g. terminal label sub-TLV)
+  countryCode: 'TH',           // optional (tag 58, default 'TH')
 });
 ```
 
+Tag order matches real Thai bill-payment QRs (`00,01,30,58,53,…,62,63` — note
+`58` before `53`), so a decoded bill-payment QR round-trips **byte-for-byte**:
+`generateBillPayment({ ...account, ...transaction })` from a `detach()` of an
+SCB/Mae Manee QR reproduces the original exactly (including its tag-62 terminal
+label).
+
 The Biller ID and references are issued/defined by your bank (for SCB, via the
 Mae Manee / Business QR onboarding). `ref1` is required; `ref2` is optional.
 
@@ -298,7 +306,7 @@ The second `options` argument is passed straight through to `qrcode`
 | Function | Returns |
 | --- | --- |
 | `generatePromptPay({ mobile \| nationalId \| ewallet, amount?, dynamic? })` | payload string |
-| `generateBillPayment({ billerId, ref1, ref2?, amount?, dynamic?, merchantName?, merchantCity? })` | payload string |
+| `generateBillPayment({ billerId, ref1, ref2?, amount?, dynamic?, merchantName?, merchantCity?, additionalData?, countryCode? })` | payload string |
 | `generateKShopQR(amount, reference, config)` | payload string |
 | `KSHOP_DEFAULTS` / `REQUIRED_FIELDS` | KShop structural defaults / required field list |
 | `decode(payload)` | structured decode + CRC validation |

package/decode.js

@@ -291,6 +291,10 @@ function detach(qr) {
     if (t30['01'] != null) account.billerId = t30['01'];
     if (f['59'] != null) account.merchantName = f['59'];
     if (f['60'] != null) account.merchantCity = f['60'];
+    if (f['58'] != null) account.countryCode = f['58'];
+    // Tag 62 (Additional Data) — keep the raw inner string so it round-trips.
+    const raw62 = flattenTag62(d.tags);
+    if (raw62 != null) account.additionalData = raw62;
     transaction = {
       ref1: t30['02'],
       ref2: t30['03'] != null ? t30['03'] : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptpay-qrcode",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Zero-dependency PromptPay QR payload generator (PromptPay P2P, Tag 30 bill payment / Mae Manee, and KShop)",
   "main": "index.js",
   "type": "commonjs",

package/promptpay.js

@@ -115,9 +115,18 @@ function generatePromptPay({ mobile, nationalId, ewallet, amount, dynamic } = {}
  * @param {boolean} [opts.dynamic]     Force POI: true='12', false='11'. Auto if omitted.
  * @param {string} [opts.merchantName] Merchant name (tag 59).
  * @param {string} [opts.merchantCity] Merchant city (tag 60).
+ * @param {string} [opts.additionalData] Raw Additional Data Field (tag 62) value,
+ *                                       e.g. terminal label sub-TLV "0716...".
+ * @param {string} [opts.countryCode]  Country code (tag 58). Default 'TH'.
  * @returns {string} The EMVCo QR payload including CRC.
+ *
+ * Tag order follows the layout used by real Thai bill-payment QRs (SCB / Mae
+ * Manee): `00,01,30,58,53,[54],[59],[60],[62],63` — note `58` precedes `53`.
+ * This lets a decoded bill-payment QR round-trip byte-for-byte.
  */
-function generateBillPayment({ billerId, ref1, ref2, amount, dynamic, merchantName, merchantCity } = {}) {
+function generateBillPayment({
+  billerId, ref1, ref2, amount, dynamic, merchantName, merchantCity, additionalData, countryCode,
+} = {}) {
   if (!billerId) throw new Error('billerId is required');
   if (!ref1) throw new Error('ref1 is required');
 
@@ -132,13 +141,14 @@ function generateBillPayment({ billerId, ref1, ref2, amount, dynamic, merchantNa
   payload += tlv('00', '01'); // payload format indicator
   payload += tlv('01', poiMethod(dynamic, hasAmount)); // dynamic vs static
   payload += tlv('30', merchantAccount); // bill payment merchant account info
+  payload += tlv('58', countryCode || COUNTRY_TH); // country (before currency, per Thai QR layout)
   payload += tlv('53', CURRENCY_THB);
   if (hasAmount) {
     payload += tlv('54', Number(amount).toFixed(2));
   }
-  payload += tlv('58', COUNTRY_TH);
   if (merchantName) payload += tlv('59', merchantName);
   if (merchantCity) payload += tlv('60', merchantCity);
+  if (additionalData) payload += tlv('62', String(additionalData));
 
   payload += '6304' + crc16Hex(payload + '6304');
   return payload;