@teleporthq/teleport-plugin-next-workflows 0.44.4 → 0.44.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleporthq/teleport-plugin-next-workflows",
-  "version": "0.44.4",
+  "version": "0.44.6",
   "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.4",
+    "@teleporthq/teleport-shared": "^0.44.5",
     "@teleporthq/teleport-types": "^0.44.0"
   },
-  "gitHead": "cacf0be69ff0d4b04635161e5d9e880bd5a2ec92"
+  "gitHead": "c763dc9d1d966d36811d04cd422e948a5cd7e841"
 }

package/src/account-delete-route-generator.ts

@@ -6,17 +6,21 @@
  *   1. resolves the current user from the NextAuth session (never trusting a
  *      client-supplied id),
  *   2. runs a single DB transaction that detaches + anonymises business/legal
- *      records (orders, withdrawal requests) so tracking survives, deletes the
- *      user's personal data (reviews, cart, favourites, chat history) and the
- *      user row, and
+ *      records (orders, withdrawal requests, bookings) so tracking survives,
+ *      deletes the user's personal data (reviews, cart, favourites, chat
+ *      history), deletes the rows the user owns in the project's own tables —
+ *      the ones the AI made for the site, each through the one column the
+ *      site's "My …" pages read it by (teleport-shared's resolveOwnerColumn,
+ *      shipped into the route as text) — and then the user row, and
  *   3. best-effort sends the farewell email (a failed send never fails the
  *      deletion).
  *
- * Every table statement is guarded by a runtime `information_schema` column
- * check, so the route is a no-op for feature tables a given project never
- * provisioned.
+ * Every platform-table statement is guarded by a runtime `information_schema`
+ * column check, so the route is a no-op for feature tables a given project
+ * never provisioned.
  */
 import { UIDLLocalizedEmailTemplates } from '@teleporthq/teleport-types'
+import { OwnerColumns } from '@teleporthq/teleport-shared'
 import { generatePgClientCode } from './pg-client-code'
 import { generateCommonJsSessionTokenResolverCode } from './session-cookie-resolver'
 import {
@@ -84,11 +88,22 @@ const DELETE_TABLES = [
   'teleport_cart',
   'teleport_ai_chat_messages',
   'teleport_ai_chat_conversations',
+  // A push subscription is the capability to notify the user's device.
+  'teleport_push_subscriptions',
 ];
 // Business / legal records that must survive: the user link is nulled and any
 // stored personal email is replaced with a synthetic, self-describing address.
-const ANONYMIZE_TABLES = ['teleport_orders', 'teleport_withdrawal_requests'];
+const ANONYMIZE_TABLES = [
+  'teleport_orders',
+  'teleport_withdrawal_requests',
+  'teleport_bookings',
+  'teleport_subscriptions',
+  'teleport_abandoned_carts',
+  'teleport_voucher_redemptions',
+];
 const EMAIL_COLUMNS = ['billing_email', 'shipping_email', 'customer_email', 'email'];
+// A booking also names the customer and carries their phone; both are cleared.
+const CLEARED_COLUMNS = { teleport_bookings: ['customer_name', 'customer_phone'] };
 
 async function tableColumns(client, table) {
   var r = await client.query(
@@ -111,6 +126,10 @@ async function anonymizeUserRows(client, table, userId, syntheticEmail) {
       sets.push(EMAIL_COLUMNS[i] + ' = $' + params.length);
     }
   }
+  var cleared = CLEARED_COLUMNS[table] || [];
+  for (var c = 0; c < cleared.length; c++) {
+    if (cols.indexOf(cleared[c]) !== -1) { sets.push(cleared[c] + ' = NULL'); }
+  }
   await client.query('UPDATE ' + table + ' SET ' + sets.join(', ') + ' WHERE user_id = $1', params);
 }
 
@@ -127,6 +146,119 @@ async function deleteRowsByEmail(client, table, column, email) {
   await client.query('DELETE FROM ' + table + ' WHERE ' + column + ' = $1', [email]);
 }
 
+// Rows the user owns in the project's OWN tables — the ones the AI made for
+// this site (saved items, requests, reviews …). Their link to the user is
+// ON DELETE SET NULL, so they outlived the account with a blank owner, and the
+// "My …" pages read "owner = me OR owner IS NULL": every other signed-in
+// visitor saw them. Platform tables keep the explicit handling above —
+// deleted, anonymised, or kept as the business's records.
+//
+// Each table is attributed through exactly ONE column, the one its "My …"
+// pages read it by: resolveOwnerColumn below is the AI pipeline's own
+// decision, shipped here as text, so the two sides cannot disagree. Rows go
+// only through an "owner" column (whose the row is: author, submitter,
+// sender); an "actor" column (who approved, reviewed, was assigned or
+// addressed) names somebody else's row and leaves the table alone.
+${OwnerColumns.generateOwnerColumnResolverCode()}
+
+const PLATFORM_TABLE_PREFIX = 'teleport_';
+const PLATFORM_TABLES = [AUTH_USERS_TABLE, 'password_reset_tokens'];
+
+function isPlatformTable(table) {
+  return PLATFORM_TABLES.indexOf(table) !== -1 || table.indexOf(PLATFORM_TABLE_PREFIX) === 0;
+}
+
+function quoteIdentifier(name) {
+  return '"' + String(name).split('"').join('""') + '"';
+}
+
+// The (table, column) pairs through which the project's own tables name their
+// owner: the resolved owner column when it references the users table — or
+// references nothing, in older projects whose link was dropped. One that
+// references another table (account_id -> accounts) is a domain link and the
+// table is left alone. Links are read from pg_constraint rather than
+// information_schema: constraint names are only unique per table, so a join
+// by name can pair the wrong tables.
+async function ownedRowLinks(client) {
+  var columns = await client.query(
+    "SELECT c.table_name, c.column_name, c.ordinal_position FROM information_schema.columns c" +
+      " JOIN information_schema.tables t ON t.table_schema = c.table_schema AND t.table_name = c.table_name" +
+      " WHERE c.table_schema = 'public' AND t.table_type = 'BASE TABLE'" +
+      " ORDER BY c.table_name, c.ordinal_position"
+  );
+  var links = await client.query(
+    "SELECT cl.relname AS table_name, a.attname AS column_name," +
+      " rcl.relname AS referenced_table, ra.attname AS referenced_column" +
+      " FROM pg_constraint k" +
+      " JOIN pg_class cl ON cl.oid = k.conrelid" +
+      " JOIN pg_namespace n ON n.oid = cl.relnamespace" +
+      " JOIN pg_attribute a ON a.attrelid = k.conrelid AND a.attnum = k.conkey[1]" +
+      " JOIN pg_class rcl ON rcl.oid = k.confrelid" +
+      " JOIN pg_attribute ra ON ra.attrelid = k.confrelid AND ra.attnum = k.confkey[1]" +
+      " WHERE k.contype = 'f' AND n.nspname = 'public' AND array_length(k.conkey, 1) = 1"
+  );
+  var referenced = {};
+  for (var i = 0; i < links.rows.length; i++) {
+    var link = links.rows[i];
+    referenced[link.table_name + '.' + link.column_name] = link.referenced_table + '.' + link.referenced_column;
+  }
+  var tables = [];
+  var columnsOf = {};
+  for (var j = 0; j < columns.rows.length; j++) {
+    var row = columns.rows[j];
+    if (!columnsOf[row.table_name]) {
+      columnsOf[row.table_name] = [];
+      tables.push(row.table_name);
+    }
+    columnsOf[row.table_name].push({ name: row.column_name, ordinalPosition: Number(row.ordinal_position) });
+  }
+  var owned = [];
+  for (var t = 0; t < tables.length; t++) {
+    var table = tables[t];
+    if (isPlatformTable(table)) { continue; }
+    var resolved = resolveOwnerColumn(columnsOf[table]);
+    if (!resolved || resolved.kind !== 'owner') { continue; }
+    var target = referenced[table + '.' + resolved.column];
+    if (target && target !== AUTH_USERS_TABLE + '.id') { continue; }
+    owned.push({ table: table, column: resolved.column });
+  }
+  return owned;
+}
+
+// Each table is deleted from under its own savepoint, so one that refuses
+// (another user's row still points at this user's, through a link without
+// ON DELETE CASCADE) stops neither the other tables nor the account from being
+// deleted. A refused table is retried once the rest are done — the blocker may
+// have been this user's own row in another table; what is still refused stays
+// as it always did, and the log names it.
+async function deleteOwnedRows(client, userId) {
+  var pending = await ownedRowLinks(client);
+  while (pending.length > 0) {
+    var refused = [];
+    for (var i = 0; i < pending.length; i++) {
+      var link = pending[i];
+      await client.query('SAVEPOINT owned_rows');
+      try {
+        await client.query(
+          'DELETE FROM ' + quoteIdentifier(link.table) + ' WHERE ' + quoteIdentifier(link.column) + ' = $1',
+          [userId]
+        );
+        await client.query('RELEASE SAVEPOINT owned_rows');
+      } catch (err) {
+        await client.query('ROLLBACK TO SAVEPOINT owned_rows');
+        await client.query('RELEASE SAVEPOINT owned_rows');
+        link.error = err && err.message ? err.message : String(err);
+        refused.push(link);
+      }
+    }
+    if (refused.length === pending.length) { break; }
+    pending = refused;
+  }
+  for (var k = 0; k < pending.length; k++) {
+    console.error('[account-delete] rows kept in ' + pending[k].table + ' (' + pending[k].column + '): ' + pending[k].error);
+  }
+}
+
 // Invoices are a financial/tax record that must survive, but they store the
 // customer's PII denormalised and link to the user only through order_id (no
 // user_id). Scrub the PII in place, matching invoices whose order belongs to the
@@ -246,6 +378,7 @@ module.exports = async function handler(req, res) {
         for (var d = 0; d < DELETE_TABLES.length; d++) {
           await deleteUserRows(client, DELETE_TABLES[d], userId);
         }
+        await deleteOwnedRows(client, userId);
         // password_reset_tokens has no user_id — it is keyed by the email string.
         await deleteRowsByEmail(client, 'password_reset_tokens', 'email', userEmail);
         await client.query('DELETE FROM ' + AUTH_USERS_TABLE + ' WHERE id = $1', [userId]);

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,