@tallyui/components 3.5.1 → 3.5.2

package/dist/index.js

@@ -5064,11 +5064,11 @@ function Receipt({
           receipt.currency
         )} off`, `\u2212${money(discount.amountMinor)}`) }, i))
       ] }, index)),
-      receipt.fees.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index)),
-      receipt.shipping.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index)),
       row("Subtotal", money(totals.subtotalMinor)),
       lineDiscountMinor > 0 ? row("Line discounts", `\u2212${money(lineDiscountMinor)}`) : null,
       receipt.orderDiscountMinor > 0 ? row("Order discount", `\u2212${money(receipt.orderDiscountMinor)}`) : null,
+      receipt.fees.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index)),
+      receipt.shipping.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index)),
       taxRows,
       row("Total", money(totals.totalMinor), true),
       receipt.payments.map((payment, index) => row(
@@ -5277,7 +5277,7 @@ function OrdersList({ orders, onRetry, formatDate = defaultFormatDate2, footer,
               setRetryingIds(new Set(retrying.current));
             }
           }, className: "rounded-md bg-primary px-4 py-2", children: /* @__PURE__ */ jsx100(Text43, { className: "text-center font-semibold text-primary-foreground", children: "Retry" }) }) : null,
-          knownWarnings(order.warnings).map((warning, index) => /* @__PURE__ */ jsx100(View65, { className: "border-l-4 border-warning pl-2", children: /* @__PURE__ */ jsx100(Text43, { className: "text-foreground", children: warning.code === "insufficient_stock" ? `Stock short by ${warning.quantity} for ${order.lines.find((line) => line.variantId === warning.variantId)?.name}` : warning.code === "tax_rate_mismatch" ? `Tax at ${(warning.ratePpm / 1e4).toLocaleString(void 0, { maximumFractionDigits: 4 })}%: store ${formatMoney17({ amount: warning.serverMinor, currency: order.currency })} vs POS ${formatMoney17({ amount: warning.expectedMinor, currency: order.currency })}` : warning.code === "customer_ignored" ? `The online store didn't recognise the customer on this sale, so it was saved as a guest sale. Customer id: ${warning.customerId}.` : warning.code === "figures_mismatch" ? `The online store worked out different figures for this sale. ${warning.fields.map(({ field, tillMinor, serverMinor }) => `${FIGURE_LABELS.get(field) ?? field}: till ${formatMoney17({ amount: tillMinor, currency: order.currency })}, store ${formatMoney17({ amount: serverMinor, currency: order.currency })}.`).join(" ")}` : warning.bridgeMinor !== void 0 ? `Store calculated ${formatMoney17({ amount: warning.serverMinor, currency: order.currency })}; a rounding line of ${warning.bridgeMinor > 0 ? "+" : ""}${formatMoney17({ amount: warning.bridgeMinor, currency: order.currency })} brought it to ${formatMoney17({ amount: warning.expectedMinor, currency: order.currency })}` : `Store total ${formatMoney17({ amount: warning.serverMinor, currency: order.currency })} vs POS ${formatMoney17({ amount: warning.expectedMinor, currency: order.currency })}` }) }, index))
+          knownWarnings(order.warnings).map((warning, index) => /* @__PURE__ */ jsx100(View65, { className: "border-l-4 border-warning pl-2", children: /* @__PURE__ */ jsx100(Text43, { className: "text-foreground", children: warning.code === "insufficient_stock" ? `${warning.quantity} sold without stock: ${order.lines.find((line) => line.variantId === warning.variantId)?.name}` : warning.code === "tax_rate_mismatch" ? `Tax at ${(warning.ratePpm / 1e4).toLocaleString(void 0, { maximumFractionDigits: 4 })}%: store ${formatMoney17({ amount: warning.serverMinor, currency: order.currency })} vs POS ${formatMoney17({ amount: warning.expectedMinor, currency: order.currency })}` : warning.code === "customer_ignored" ? `The online store didn't recognise the customer on this sale, so it was saved as a guest sale. Customer id: ${warning.customerId}.` : warning.code === "figures_mismatch" ? `The online store worked out different figures for this sale. ${warning.fields.map(({ field, tillMinor, serverMinor }) => `${FIGURE_LABELS.get(field) ?? field}: till ${formatMoney17({ amount: tillMinor, currency: order.currency })}, store ${formatMoney17({ amount: serverMinor, currency: order.currency })}.`).join(" ")}` : warning.bridgeMinor !== void 0 ? `Store calculated ${formatMoney17({ amount: warning.serverMinor, currency: order.currency })}; a rounding line of ${warning.bridgeMinor > 0 ? "+" : ""}${formatMoney17({ amount: warning.bridgeMinor, currency: order.currency })} brought it to ${formatMoney17({ amount: warning.expectedMinor, currency: order.currency })}` : `Store total ${formatMoney17({ amount: warning.serverMinor, currency: order.currency })} vs POS ${formatMoney17({ amount: warning.expectedMinor, currency: order.currency })}` }) }, index))
         ] }, order.id);
       })
     ] }, section.title)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tallyui/components",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "type": "module",
   "description": "Universal POS UI components for Tally UI",
   "main": "./dist/index.js",
@@ -27,22 +27,22 @@
     "directory": "packages/components"
   },
   "peerDependencies": {
-    "@tallyui/core": "^3.5.1",
-    "@tallyui/primitives": "^3.5.1",
-    "@tallyui/theme": "^3.5.1",
+    "@tallyui/core": "^3.5.2",
+    "@tallyui/primitives": "^3.5.2",
+    "@tallyui/theme": "^3.5.2",
     "react": ">=18",
     "react-native": ">=0.74",
     "react-native-svg": ">=15"
   },
   "dependencies": {
     "class-variance-authority": "^0.7.1",
-    "@tallyui/pos": "3.5.1"
+    "@tallyui/pos": "3.5.2"
   },
   "devDependencies": {
-    "@tallyui/connector-medusa": "3.5.1",
-    "@tallyui/connector-vendure": "3.5.1",
-    "@tallyui/connector-woocommerce": "3.5.1",
-    "@tallyui/mock-api": "3.5.1",
+    "@tallyui/connector-medusa": "3.5.2",
+    "@tallyui/connector-vendure": "3.5.2",
+    "@tallyui/connector-woocommerce": "3.5.2",
+    "@tallyui/mock-api": "3.5.2",
     "@types/react": ">=18",
     "react": "^19.2.4",
     "react-native-svg": "15.12.1",

package/src/sale/orders-list.tsx

@@ -107,7 +107,7 @@ export function OrdersList({ orders, onRetry, formatDate = defaultFormatDate, fo
               </Pressable> : null}
             {knownWarnings(order.warnings).map((warning, index) => <View key={index} className="border-l-4 border-warning pl-2"><Text className="text-foreground">
               {warning.code === 'insufficient_stock'
-                ? `Stock short by ${warning.quantity} for ${order.lines.find((line) => line.variantId === warning.variantId)?.name}`
+                ? `${warning.quantity} sold without stock: ${order.lines.find((line) => line.variantId === warning.variantId)?.name}`
                 : warning.code === 'tax_rate_mismatch'
                 ? `Tax at ${(warning.ratePpm / 10000).toLocaleString(undefined, { maximumFractionDigits: 4 })}%: store ${formatMoney({ amount: warning.serverMinor, currency: order.currency })} vs POS ${formatMoney({ amount: warning.expectedMinor, currency: order.currency })}`
                 : warning.code === 'customer_ignored'

package/src/sale/receipt.tsx

@@ -50,11 +50,12 @@ export function Receipt({ order, posOrder, store, cashier, registerId, newSale,
     </View>)}
     {/* Each discount appears once in the totals: line discounts are itemised under their lines and summed once here;
         the order discount appears once. order.display's figures (ADR-063; medusapos ADR 0008). */}
-    {receipt.fees.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index))}
-    {receipt.shipping.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index))}
     {row('Subtotal', money(totals.subtotalMinor))}
     {lineDiscountMinor > 0 ? row('Line discounts', `−${money(lineDiscountMinor)}`) : null}
     {receipt.orderDiscountMinor > 0 ? row('Order discount', `−${money(receipt.orderDiscountMinor)}`) : null}
+    {/* Charges are not in the subtotal (order.display): they follow it and its discounts, before tax. */}
+    {receipt.fees.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index))}
+    {receipt.shipping.map((charge, index) => row(charge.name, money(charge.amountMinor), false, index))}
     {taxRows}
     {row('Total', money(totals.totalMinor), true)}
     {receipt.payments.map((payment, index) => row(payment.method === 'cash' ? 'Cash tendered' : 'Card terminal',