@teleporthq/teleport-plugin-next-workflows 0.44.5 → 0.44.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleporthq/teleport-plugin-next-workflows",
-  "version": "0.44.5",
+  "version": "0.44.7",
   "description": "A plugin for workflow code generation in Next.js projects.",
   "author": "teleportHQ",
   "license": "MIT",
@@ -66,8 +66,8 @@
   },
   "dependencies": {
     "@babel/types": "^7.5.5",
-    "@teleporthq/teleport-shared": "^0.44.5",
+    "@teleporthq/teleport-shared": "^0.44.7",
     "@teleporthq/teleport-types": "^0.44.0"
   },
-  "gitHead": "f58fa8b4c3e69d550a3fc13f85245f61789d7d92"
+  "gitHead": "a279c1bd1e268a8b7302e2c4fafd45748a1d242a"
 }

package/src/api-route-generator.ts

@@ -527,11 +527,12 @@ function __isStreamingAI(node, config) {
   return config && config.streaming && __streamingAITypes.indexOf(node.type) >= 0;
 }
 
-// One node's result to the browser — never one kept on the server (see segmentReply).
+// One node's result to the browser — never one kept on the server, and a data
+// node's rows without the users table's credentials (see segmentReply).
 function __streamNodeResult(res, nodeId, result) {
   const kept = SEGMENT_CONFIG.nodes.find(function(nd) { return nd.id === nodeId; });
   if (kept && kept.config && kept.config.keepResultOnServer === true && !utils.isBranchingNodeType(kept.type)) return;
-  res.write('data: ' + JSON.stringify({ type: 'node-result', nodeId: nodeId, result: result }) + '\\n\\n');
+  res.write('data: ' + JSON.stringify({ type: 'node-result', nodeId: nodeId, result: utils.withoutCredentialColumns(kept, result) }) + '\\n\\n');
 }
 
 function __collectSegBranchNodes(startId, excludeId) {

package/src/credential-columns-code.ts

@@ -0,0 +1,59 @@
+import { TableAccess } from '@teleporthq/teleport-shared'
+import { DATA_NODE_TYPES } from './data-api-route-generator'
+
+/**
+ * Runtime helpers that leave the auth users table's credential columns out of
+ * the rows a server segment answers the browser with — the columns
+ * `TableAccess.AUTH_CREDENTIAL_COLUMNS` names, the ones every browser read of
+ * the data route is already served without. A data node of a server segment
+ * reads through the data route as the app's own server code, so its rows come
+ * back whole, and the segment's reply (or a streamed node result) is the
+ * browser's copy of them.
+ *
+ * Only the results of the nodes that read rows (`DATA_NODE_TYPES`) are
+ * touched: all the credentials of a row of the users table, the unambiguous
+ * ones of a raw statement's row, whose table is not known. A row is the
+ * result itself (a create or update spreads its row into it), an object it
+ * holds, or an element of an array it holds; column values are not walked.
+ */
+export const generateCredentialColumnsCode = (): string => `
+var __CREDENTIAL_COLUMNS = ${JSON.stringify(TableAccess.AUTH_CREDENTIAL_COLUMNS)};
+var __UNAMBIGUOUS_CREDENTIAL_COLUMNS = ${JSON.stringify(
+  TableAccess.UNAMBIGUOUS_CREDENTIAL_COLUMNS
+)};
+var __CREDENTIAL_TABLES = ${JSON.stringify(TableAccess.AUTH_CREDENTIAL_TABLES)};
+var __ROW_NODE_TYPES = ${JSON.stringify(Array.from(DATA_NODE_TYPES))};
+
+function credentialColumnsOf(node) {
+  if (!node || __ROW_NODE_TYPES.indexOf(node.type) === -1) return [];
+  var tableName = node.config && typeof node.config.tableName === 'string' ? node.config.tableName : '';
+  if (!tableName) return __UNAMBIGUOUS_CREDENTIAL_COLUMNS;
+  var parts = tableName.trim().toLowerCase().replace(/"/g, '').split('.');
+  return __CREDENTIAL_TABLES.indexOf(parts[parts.length - 1]) !== -1 ? __CREDENTIAL_COLUMNS : [];
+}
+
+function withoutColumns(row, columns) {
+  if (!row || typeof row !== 'object' || Array.isArray(row)) return row;
+  var kept = {};
+  Object.keys(row).forEach(function(key) {
+    if (columns.indexOf(String(key).toLowerCase()) === -1) kept[key] = row[key];
+  });
+  return kept;
+}
+
+function withoutRowsColumns(value, columns) {
+  if (Array.isArray(value)) return value.map(function(row) { return withoutColumns(row, columns); });
+  return withoutColumns(value, columns);
+}
+
+function withoutCredentialColumns(node, result) {
+  var columns = credentialColumnsOf(node);
+  if (columns.length === 0 || !result || typeof result !== 'object') return result;
+  if (Array.isArray(result)) return withoutRowsColumns(result, columns);
+  var kept = withoutColumns(result, columns);
+  Object.keys(kept).forEach(function(key) {
+    if (kept[key] && typeof kept[key] === 'object') kept[key] = withoutRowsColumns(kept[key], columns);
+  });
+  return kept;
+}
+`

package/src/data-api-route-generator.ts

@@ -15,7 +15,7 @@ import { generateSqlValidatorCode } from './sql-validator'
 import { generateCommonJsSessionTokenResolverCode } from './session-cookie-resolver'
 import { ContentTables, TableAccess } from '@teleporthq/teleport-shared'
 
-const DATA_NODE_TYPES = new Set([
+export const DATA_NODE_TYPES: ReadonlySet<string> = new Set([
   'data-select',
   'data-create-item',
   'data-update-item',
@@ -677,6 +677,13 @@ function dropMissingOptionalColumns(tableName, entries, colTypes) {
   return kept;
 }
 
+// The row a create or update answers with, whoever asked, without the auth
+// users table's credentials (the columns a browser read is served without):
+// a server-side caller hands that answer on to the browser as its result.
+function withoutCredentialColumns(row, tableName) {
+  return row ? __taWithoutCredentials([row], tableName)[0] : row;
+}
+
 async function handleCreate(client, body) {
   var tableName = body.tableName;
   var columnMappings = body.columnMappings || {};
@@ -751,7 +758,7 @@ async function handleCreate(client, body) {
   var item = result.rows && result.rows[0] ? result.rows[0] : null;
   var idIdx = columns.indexOf('id');
   var resolvedId = item ? (item.id || null) : (idIdx >= 0 ? values[idIdx] : null);
-  return { item: item, id: resolvedId };
+  return { item: withoutCredentialColumns(item, tableName), id: resolvedId };
 }
 
 async function handleUpdate(client, body) {
@@ -803,7 +810,8 @@ async function handleUpdate(client, body) {
   sql += ' RETURNING *';
 
   var result = await safeQuery(client, sql, queryParams, 'update');
-  return { updatedCount: result.rowCount || 0, item: result.rows[0] || null, id: (result.rows[0] && result.rows[0].id) || null };
+  var updated = result.rows[0] || null;
+  return { updatedCount: result.rowCount || 0, item: withoutCredentialColumns(updated, tableName), id: (updated && updated.id) || null };
 }
 
 async function handleDelete(client, body) {

package/src/executor-generator.ts

@@ -4,6 +4,7 @@ import {
   generateWorkflowLocaleHelpersCode,
 } from './email-locale'
 import { generateSignedInDestinationCode } from './auth-return/signed-in-destination-code'
+import { generateCredentialColumnsCode } from './credential-columns-code'
 
 export interface SharedRuntimeUtilsOptions {
   /**
@@ -1414,6 +1415,10 @@ var SEGMENT_REPLY_PRIVATE_KEYS = {
 // nodes after it in the same segment and never leaves the server (a statement's
 // rows read only to build what the browser may see, a sender's recipients).
 // Nothing in a later segment can read it.
+//
+// A data node's rows are replied without the auth users table's credentials
+// (see credential-columns-code.ts).
+${generateCredentialColumnsCode()}
 // The nodes whose result the client branches on: never kept on the server.
 function isBranchingNodeType(type) {
   return type === 'general-if-statement' || type === 'general-switch';
@@ -1425,7 +1430,7 @@ function segmentReply(segmentConfig, context, snapshot) {
   var kept = {};
   var nodes = (segmentConfig && segmentConfig.nodes) || [];
   for (var ni = 0; ni < nodes.length; ni++) {
-    own[nodes[ni].id] = true;
+    own[nodes[ni].id] = nodes[ni];
     if (nodes[ni].config && nodes[ni].config.keepResultOnServer === true && !isBranchingNodeType(nodes[ni].type)) {
       kept[nodes[ni].id] = true;
     }
@@ -1436,7 +1441,11 @@ function segmentReply(segmentConfig, context, snapshot) {
     if (SEGMENT_REPLY_PRIVATE_KEYS[key] || kept[key]) continue;
     var value = context[key];
     if (value === undefined) continue;
-    if (own[key] || !snapshot || !Object.prototype.hasOwnProperty.call(snapshot, key)) {
+    if (own[key]) {
+      reply[key] = withoutCredentialColumns(own[key], value);
+      continue;
+    }
+    if (!snapshot || !Object.prototype.hasOwnProperty.call(snapshot, key)) {
       reply[key] = value;
       continue;
     }
@@ -1504,6 +1513,7 @@ module.exports = {
   loopIterationContext,
   snapshotIncomingContext,
   segmentReply,
+  withoutCredentialColumns,
   evaluateCondition,
   evaluateSingleComparison,
   normalizeComparisonOperator,

package/src/invoice/invoice-assembly-code.ts

@@ -93,6 +93,16 @@ var CURRENCY_SYMBOLS = {
   'CLP': 'CLP$', 'PEN': 'S/.', 'VND': '\\u20AB', 'UAH': '\\u20B4',
 };
 
+// \`teleport_orders.payment_status\` values that mean the order's money was
+// collected — the editor's PAID_PAYMENT_STATUS_VALUES (teleport-gui
+// e-commerce/constants/order-statuses.ts), provider spellings included.
+var PAID_ORDER_PAYMENT_STATUSES = ['paid', 'partially_refunded', 'succeeded', 'success', 'completed', 'captured'];
+
+function isPaidOrder(order) {
+  var paymentStatus = String((order && order.payment_status) || '').trim().toLowerCase();
+  return PAID_ORDER_PAYMENT_STATUSES.indexOf(paymentStatus) !== -1;
+}
+
 function isLoopbackHost(host) {
   var name = String(host || '').replace(/:[0-9]+$/, '').toLowerCase();
   return name === 'localhost' || name === '127.0.0.1' || name === '[::1]';
@@ -473,15 +483,22 @@ function assembleInvoiceData(body, hydratedOrder, hydratedItems) {
   var fallbackPaymentIntentId = orderRow.payment_intent_id || '';
   var fallbackNotes = orderRow.notes || '';
 
+  // Paid or not, when the caller does not say: the order's money state. The
+  // payment webhook marks an order paid and then asks for its invoice with just
+  // the order id; a cash-on-delivery order is invoiced unpaid when it is placed.
+  // The orders table keeps no payment time of its own — the mark-paid write
+  // stamps \`updated_at\`, just before the webhook asks.
+  var paidByOrder = !body.status && isPaidOrder(orderRow);
+
   var invoiceData = {
     id: body.id || require('crypto').randomUUID(),
     // Numbered by the route: an invoice issued at payment takes the next
     // number, a regenerated one keeps its own.
     invoiceNumber: '',
-    status: body.status || 'issued',
+    status: body.status || (paidByOrder ? 'paid' : 'issued'),
     issueDate: issueDate,
     dueDate: dueDate,
-    paidAt: body.paidAt || null,
+    paidAt: body.paidAt || (paidByOrder ? orderRow.updated_at || new Date().toISOString() : null),
     customerName: body.customerName || fallbackCustomerName || '',
     customerEmail: body.customerEmail || fallbackCustomerEmail || '',
     customerAddress: body.customerAddress || fallbackCustomerAddress || '',

package/src/invoice/invoice-html-code.ts

@@ -12,12 +12,12 @@ import { UIDLInvoiceSettings } from '@teleporthq/teleport-types'
 //
 // The UIDL tree has several features that need runtime handling:
 //
-//   1. `<context>` elements carry default invoice data on their attributes
-//      (Company, Invoice, Customer, Products, Payment). Children reference
-//      that data through expressions like `invoiceData?.Company?.name`. We
-//      build a per-render scope from the attrs merged with real DB data
-//      (real wins unless empty) so every expression resolves against the
-//      buyer's actual order.
+//   1. `<context>` elements carry the design canvas's sample invoice on
+//      their attributes (Company, Invoice, Customer, Products, Payment).
+//      Children reference that data through expressions like
+//      `invoiceData?.Company?.name`. Every render builds the scope from the
+//      real invoice alone, so every expression resolves against the buyer's
+//      actual order and an empty field prints nothing — never the sample.
 //
 //   2. `cms-list-repeater` iterates `invoiceData.Products` with a
 //      per-iteration variable (the `renderPropIdentifier`). Each line item
@@ -153,11 +153,12 @@ var COMPONENT_DEFINITIONS = ${componentDefinitionsJson};
 var MAX_COMPONENT_DEPTH = 12;
 
 // ---------------------------------------------------------------------------
-// Scope construction — merges real DB data with defaults the user set on
-// the <context> element in the editor. Per-field fallback: if the real
-// field is empty/null, the UIDL default wins. Covers the common dev case
-// where COMPANY_DETAILS from invoiceSettings isn't filled in but the user
-// dropped "Acme Corporation" into the template preview.
+// Scope construction — the real invoice, the store's company details and the
+// buyer, never the sample on the template's <context>: an empty notes field,
+// VAT number or paid date printed the design canvas's "Payment is due within
+// 30 days", "US123456789" or "Jan 20, 2025" on a real invoice. The one value
+// read from the context is the company logo URL, which the editor writes there
+// from the store's own logo (the sample's is empty).
 // ---------------------------------------------------------------------------
 
 function extractStaticAttrsFromContext(uidl) {
@@ -194,23 +195,9 @@ function findFirstContextNode(node) {
   return null;
 }
 
-function nonEmpty(v) {
-  if (v == null) return false;
-  if (typeof v === 'string') return v.length > 0;
-  if (typeof v === 'number') return !isNaN(v);
-  return true;
-}
-
-function mergeWithDefaults(primary, defaults) {
-  var out = Object.assign({}, defaults || {});
-  if (primary) {
-    Object.keys(primary).forEach(function (k) {
-      if (nonEmpty(primary[k])) out[k] = primary[k];
-    });
-  }
-  return out;
-}
-
+// Money on the invoice, in the PDF and the email alike. A symbol that ends in
+// a letter is a word ("lei", "CHF", "kr") and stands apart from the number
+// ("lei 119.00"); a sign sits against it ("$119.00", "\u20AC119.00").
 function formatCurrencyValue(amount, sym, decimals) {
   var num = Number(amount);
   if (!isFinite(num)) num = 0;
@@ -218,7 +205,17 @@ function formatCurrencyValue(amount, sym, decimals) {
   var fixed = num.toFixed(dec);
   var parts = fixed.split('.');
   parts[0] = parts[0].replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',');
-  return (sym || '') + parts.join('.');
+  var symbol = String(sym == null ? '' : sym).trim();
+  var separator = /\\p{L}$/u.test(symbol) ? ' ' : '';
+  return symbol + separator + parts.join('.');
+}
+
+// Invoice statuses of money that was collected: a refund later moves a paid
+// invoice to one of the last two, and it was paid all the same.
+var SETTLED_INVOICE_STATUSES = ['paid', 'partially_refunded', 'refunded'];
+
+function isSettledInvoice(status) {
+  return SETTLED_INVOICE_STATUSES.indexOf(String(status || '').toLowerCase()) !== -1;
 }
 
 // Per-line VAT formulas. These MIRROR the GUI helpers in
@@ -269,7 +266,7 @@ function formatDateValue(raw) {
 }
 
 function buildInvoiceDataScope(invoiceData) {
-  var defaults = extractStaticAttrsFromContext(TEMPLATE_COMPONENT_UIDL);
+  var contextCompany = extractStaticAttrsFromContext(TEMPLATE_COMPONENT_UIDL).Company || {};
   var sym = invoiceData.currencySymbol || '$';
 
   var realCompany = {
@@ -283,7 +280,7 @@ function buildInvoiceDataScope(invoiceData) {
     registrationNumber: COMPANY_DETAILS.companyRegNumber,
     email: COMPANY_DETAILS.companyEmail,
     phone: COMPANY_DETAILS.companyPhone,
-    logoUrl: invoiceData.companyLogoUrl || '',
+    logoUrl: invoiceData.companyLogoUrl || contextCompany.logoUrl || '',
     website: COMPANY_DETAILS.companyWebsite,
   };
 
@@ -319,12 +316,20 @@ function buildInvoiceDataScope(invoiceData) {
     amountDueNumber = Math.max(0, totalNumber - giftCardAmountNumber);
   }
 
+  // A paid invoice asks for nothing: where the due date would print, it says
+  // when it was paid. The order keeps no payment method finer than its
+  // provider, so the line names none.
+  var paid = isSettledInvoice(invoiceData.status);
+  var paidDate = formatDateValue(invoiceData.paidAt || (paid ? invoiceData.issueDate : ''));
+  var paidLine = paid ? 'Paid' + (paidDate ? ' on ' + paidDate : '') : '';
+
   var realInvoice = {
     invoiceNumber: invoiceData.invoiceNumber ? '#' + invoiceData.invoiceNumber : '',
     status: invoiceData.status || '',
     issueDate: formatDateValue(invoiceData.issueDate),
-    dueDate: formatDateValue(invoiceData.dueDate),
-    paidDate: formatDateValue(invoiceData.paidAt),
+    dueDate: paidLine || formatDateValue(invoiceData.dueDate),
+    paidDate: paidDate,
+    paidLine: paidLine,
     subtotal: formatCurrencyValue(invoiceData.subtotal, sym),
     taxRate: invoiceData.taxRate != null ? String(invoiceData.taxRate) : '',
     taxAmount: formatCurrencyValue(invoiceData.taxAmount, sym),
@@ -351,13 +356,6 @@ function buildInvoiceDataScope(invoiceData) {
     notes: invoiceData.notes || '',
     pdfUrl: invoiceData.pdfUrl || '',
   };
-  // The merge below lets an EMPTY real value fall back to the template's
-  // sample — right for a company address, wrong for a code or a card tail: an
-  // order without a voucher must not print the designer's "SAVE20".
-  var realInvoiceNeverSampled = { voucherCode: voucherCode, giftCardLast4: giftCardLast4 };
-  // The buyer and their payment are never sampled either: an order with no
-  // city (a booking, a pickup, a download) must not print the designer's
-  // sample customer's, nor a card it was not paid with.
 
   var realCustomer = {
     name: invoiceData.customerName || '',
@@ -470,11 +468,11 @@ function buildInvoiceDataScope(invoiceData) {
 
   return {
     invoiceData: {
-      Company: mergeWithDefaults(realCompany, defaults.Company),
-      Invoice: Object.assign(mergeWithDefaults(realInvoice, defaults.Invoice), realInvoiceNeverSampled),
+      Company: realCompany,
+      Invoice: realInvoice,
       Customer: realCustomer,
       Payment: realPayment,
-      Products: realProducts.length > 0 ? realProducts : (defaults.Products || []),
+      Products: realProducts,
     },
   };
 }
@@ -975,7 +973,12 @@ function buildFallbackInvoiceHtml(scope) {
   var parts = [];
   parts.push('<div style="padding:32px;font-family:Helvetica,Arial,sans-serif;color:#333;font-size:10pt;">');
   parts.push('<h1 style="text-align:right;font-size:24pt;margin:0 0 4px;">INVOICE</h1>');
-  parts.push('<p style="text-align:right;color:#666;margin:0 0 24px;">' + escapeHtml(inv.invoiceNumber || '') + '</p>');
+  if (inv.paidLine) {
+    parts.push('<p style="text-align:right;color:#666;margin:0 0 4px;">' + escapeHtml(inv.invoiceNumber || '') + '</p>');
+    parts.push('<p style="text-align:right;color:#666;margin:0 0 24px;">' + escapeHtml(inv.paidLine) + '</p>');
+  } else {
+    parts.push('<p style="text-align:right;color:#666;margin:0 0 24px;">' + escapeHtml(inv.invoiceNumber || '') + '</p>');
+  }
   parts.push('<div style="display:flex;gap:40px;margin-bottom:24px;">');
   parts.push('<div style="flex:1;"><strong>' + escapeHtml(comp.name || '') + '</strong><br/>' +
     escapeHtml(comp.address || '') + '<br/>' +
@@ -1074,25 +1077,47 @@ function resolveTextSpans(spans, scope) {
   }).join('');
 }
 
-// Amount tokens whose line means nothing at zero: "Delivery $0.00" on a
-// pickup order, "Discount −$0.00" without a voucher. The table row (or list
-// item / paragraph) that carries such a token is dropped before the tokens are
-// filled, so the merchant's summary only lists the figures that applied.
-// Matched innermost — a row inside a row keeps its parent.
-var OPTIONAL_AMOUNT_TOKENS = ['shippingAmount', 'discountAmount', 'giftCardAmount'];
-
-function stripZeroAmountLines(template, inv) {
-  var out = template;
-  for (var i = 0; i < OPTIONAL_AMOUNT_TOKENS.length; i++) {
-    var key = OPTIONAL_AMOUNT_TOKENS[i];
-    if (Number(inv[key] || 0) > 0) continue;
-    var line = new RegExp(
-      '<(tr|li|p)\\\\b(?:(?!<\\\\/?\\\\1\\\\b)[\\\\s\\\\S])*?\\\\{\\\\{' + key + '\\\\}\\\\}(?:(?!<\\\\/?\\\\1\\\\b)[\\\\s\\\\S])*?<\\\\/\\\\1\\\\s*>',
-      'g'
-    );
-    out = out.replace(line, '');
-  }
-  return out;
+// The summary lines the email leaves out. An amount whose line means nothing at
+// zero: "Delivery $0.00" on a pickup order, "Discount −$0.00" without a
+// voucher, "Tax $0.00" in an untaxed store. And what a paid invoice no longer
+// asks for: its due date and the amount due. As on the PDF, the amount due is
+// printed only beside a gift card; without one it is the total again.
+var OPTIONAL_AMOUNT_TOKENS = ['shippingAmount', 'discountAmount', 'taxAmount', 'giftCardAmount'];
+
+function omittedLineTokens(inv) {
+  var tokens = OPTIONAL_AMOUNT_TOKENS.filter(function (key) {
+    return !(Number(inv[key] || 0) > 0);
+  });
+  var paid = isSettledInvoice(inv.status);
+  if (paid) tokens.push('dueDate');
+  if (paid || !(Number(inv.giftCardAmount || 0) > 0)) tokens.push('amountDue');
+  return tokens;
+}
+
+// A line is the table row, list item or paragraph carrying the token, matched
+// innermost — a row inside a row keeps its parent. The editor's designs publish
+// each line as a <div> of <span>s instead, so a token outside those drops the
+// innermost <div> holding it, and only when that <div> is the line alone: one
+// that also holds a block or another token is the merchant's own, and stays.
+var NO_BLOCK_OR_TOKEN = '(?!<\\\\/?(?:div|p|tr|li|table|ul|ol|h[1-6])\\\\b|\\\\{\\\\{)';
+
+function stripLinesHolding(template, key) {
+  var token = '\\\\{\\\\{' + key + '\\\\}\\\\}';
+  var row = new RegExp(
+    '<(tr|li|p)\\\\b(?:(?!<\\\\/?\\\\1\\\\b)[\\\\s\\\\S])*?' + token + '(?:(?!<\\\\/?\\\\1\\\\b)[\\\\s\\\\S])*?<\\\\/\\\\1\\\\s*>',
+    'g'
+  );
+  var lineDiv = new RegExp(
+    '<div\\\\b(?:' + NO_BLOCK_OR_TOKEN + '[\\\\s\\\\S])*?' + token + '(?:' + NO_BLOCK_OR_TOKEN + '[\\\\s\\\\S])*?<\\\\/div\\\\s*>',
+    'g'
+  );
+  return template.replace(row, '').replace(lineDiv, '');
+}
+
+function stripOmittedLines(template, inv) {
+  return omittedLineTokens(inv).reduce(function (out, key) {
+    return stripLinesHolding(out, key);
+  }, template);
 }
 
 function replacePlaceholders(template, data) {
@@ -1100,7 +1125,8 @@ function replacePlaceholders(template, data) {
   var inv = data.invoice || {};
   var cust = data.customer || {};
   var comp = data.company || {};
-  return stripZeroAmountLines(template, inv).replace(/\\{\\{(\\w+)\\}\\}/g, function (match, key) {
+  var sym = inv.currencySymbol;
+  return stripOmittedLines(template, inv).replace(/\\{\\{(\\w+)\\}\\}/g, function (match, key) {
     var map = {
       invoiceNumber: inv.number || '',
       customerName: cust.name || '',
@@ -1111,14 +1137,14 @@ function replacePlaceholders(template, data) {
       // so the mail and its attachment agree.
       invoiceDate: formatDateValue(inv.issueDate),
       dueDate: formatDateValue(inv.dueDate),
-      totalAmount: (inv.currencySymbol || '') + Number(inv.total || 0).toFixed(2),
-      subtotal: (inv.currencySymbol || '') + Number(inv.subtotal || 0).toFixed(2),
-      taxAmount: (inv.currencySymbol || '') + Number(inv.taxAmount || 0).toFixed(2),
-      shippingAmount: (inv.currencySymbol || '') + Number(inv.shippingAmount || 0).toFixed(2),
-      discountAmount: (inv.currencySymbol || '') + Number(inv.discountAmount || 0).toFixed(2),
-      giftCardAmount: (inv.currencySymbol || '') + Number(inv.giftCardAmount || 0).toFixed(2),
+      totalAmount: formatCurrencyValue(inv.total, sym),
+      subtotal: formatCurrencyValue(inv.subtotal, sym),
+      taxAmount: formatCurrencyValue(inv.taxAmount, sym),
+      shippingAmount: formatCurrencyValue(inv.shippingAmount, sym),
+      discountAmount: formatCurrencyValue(inv.discountAmount, sym),
+      giftCardAmount: formatCurrencyValue(inv.giftCardAmount, sym),
       // What is left after a gift card; the whole total when none was used.
-      amountDue: (inv.currencySymbol || '') + Number(inv.amountDue != null ? inv.amountDue : (inv.total || 0)).toFixed(2),
+      amountDue: formatCurrencyValue(inv.amountDue != null ? inv.amountDue : inv.total, sym),
       companyName: comp.name || '',
       companyEmail: comp.email || '',
       invoiceUrl: inv.pdfUrl || '',
@@ -1136,6 +1162,9 @@ function buildDataContext(invoiceData) {
   return {
     invoice: {
       number: invoiceData.invoiceNumber || '',
+      // Paid or not decides which lines the email keeps (see omittedLineTokens).
+      status: invoiceData.status || '',
+      paidAt: invoiceData.paidAt || null,
       issueDate: invoiceData.issueDate || '',
       dueDate: invoiceData.dueDate || '',
       subtotal: invoiceData.subtotal || 0,