rerobe-js-orm 3.8.3 → 3.8.5

package/lib/helpers/OrderHelpers.d.ts

@@ -217,9 +217,10 @@ export default class OrderHelpers {
     getPaymentTerminalReceiptInfo(payload?: any): PaymentTerminalReceiptInfo;
     getFormattedFulfillmentLocation(order: ReRobeOrderObj): string;
     generateReceiptLabels(locale: string, paymentMethod: string, entryMethod?: string): ReceiptLabels;
-    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl, }: {
+    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl, receiptNumber, }: {
         order: ReRobeOrderObj;
         merchant: MerchantObj;
         merchantLogoUrl: string;
+        receiptNumber: string;
     }): ReceiptObj;
 }

package/lib/helpers/OrderHelpers.js

@@ -545,36 +545,37 @@ class OrderHelpers {
             entryMethodLabel,
         };
     }
-    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl = '', }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl = '', receiptNumber = '', }) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const { address: merchantAddress, legalName, contactEmail, phone = '', organizationNumber = '', primaryDomain, currency: storeCurrencyCode, } = merchant;
         const currencyCode = ((_a = order.totalPricePresentment) === null || _a === void 0 ? void 0 : _a.currencyCode) || storeCurrencyCode;
         const presentmentLocale = (0, Utilities_1.getPresentmentLocaleByCurrencyCode)(currencyCode);
         const mapLineItem = (l) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             let totalPrice = Number((_a = l.presentmentTotalPrice) === null || _a === void 0 ? void 0 : _a.amount);
             if (l.isTaxable && l.taxRate) {
                 const taxRate = Number(l.taxRate);
                 totalPrice *= 1 + taxRate;
             }
+            let title = l.title || l.brand || '';
+            if (Number(l === null || l === void 0 ? void 0 : l.quantity) > 1) {
+                title += `\n${Number(l === null || l === void 0 ? void 0 : l.quantity)} x ${(0, Utilities_1.formatPrice)({
+                    currencyCode,
+                    amount: (_c = (_b = l === null || l === void 0 ? void 0 : l.originalUnitPrice) === null || _b === void 0 ? void 0 : _b.amount) !== null && _c !== void 0 ? _c : '',
+                    fractionDigits: 2,
+                })}`;
+            }
             return {
-                title: l.title || l.brand || '',
+                title,
                 price: (0, Utilities_1.formatPrice)({
                     currencyCode,
                     amount: totalPrice,
                     fractionDigits: 2,
                 }),
-                quantity: Number((_b = l === null || l === void 0 ? void 0 : l.quantity) !== null && _b !== void 0 ? _b : 0),
-                showUnitPrice: Number(l === null || l === void 0 ? void 0 : l.quantity) > 1,
-                unitPrice: (0, Utilities_1.formatPrice)({
-                    currencyCode,
-                    amount: (_d = (_c = l === null || l === void 0 ? void 0 : l.originalUnitPrice) === null || _c === void 0 ? void 0 : _c.amount) !== null && _d !== void 0 ? _d : '',
-                    fractionDigits: 2,
-                }),
             };
         };
         const buildLineItems = () => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             let result = order.lineItems.map(mapLineItem);
             if (((_a = order.totalDiscountPresentment) === null || _a === void 0 ? void 0 : _a.amount) && Number((_b = order.totalDiscountPresentment) === null || _b === void 0 ? void 0 : _b.amount) > 0) {
                 result = [
@@ -586,13 +587,6 @@ class OrderHelpers {
                             amount: (_c = order.totalDiscountPresentment) === null || _c === void 0 ? void 0 : _c.amount,
                             fractionDigits: 2,
                         }),
-                        showUnitPrice: false,
-                        quantity: 1,
-                        unitPrice: (0, Utilities_1.formatPrice)({
-                            currencyCode,
-                            amount: (_d = order.totalDiscountPresentment) === null || _d === void 0 ? void 0 : _d.amount,
-                            fractionDigits: 2,
-                        }),
                     },
                 ];
             }
@@ -637,17 +631,21 @@ class OrderHelpers {
         const paymentMethod = (_b = order.paymentMethod) !== null && _b !== void 0 ? _b : '';
         return Object.assign(Object.assign({ merchantLogoUrl, merchantName: legalName, storeAddress: buildStoreAddress(), phone,
             contactEmail,
-            organizationNumber, primaryDomain: `https://${primaryDomain}`, orderDate: (0, Utilities_1.getFormattedTimestamp)(presentmentLocale), lineItems: buildLineItems(), subTotal: (0, Utilities_1.formatPrice)({
+            organizationNumber, primaryDomain: `https://${primaryDomain}`, orderDate: (0, Utilities_1.getFormattedTimestamp)(presentmentLocale), receiptNumber, lineItems: buildLineItems(), subTotal: (0, Utilities_1.formatPrice)({
                 currencyCode,
                 amount: (_d = (_c = order.subtotalPricePresentment) === null || _c === void 0 ? void 0 : _c.amount) !== null && _d !== void 0 ? _d : '',
                 fractionDigits: 2,
-            }), amountPaid: (0, Utilities_1.formatPrice)({
+            }), total: (0, Utilities_1.formatPrice)({
                 currencyCode,
                 amount: (_f = (_e = order.totalPricePresentment) === null || _e === void 0 ? void 0 : _e.amount) !== null && _f !== void 0 ? _f : '',
                 fractionDigits: 2,
+            }), amountPaid: (0, Utilities_1.formatPrice)({
+                currencyCode,
+                amount: (_h = (_g = order.totalPricePresentment) === null || _g === void 0 ? void 0 : _g.amount) !== null && _h !== void 0 ? _h : '',
+                fractionDigits: 2,
             }), tax: (0, Utilities_1.formatPrice)({
                 currencyCode,
-                amount: (_h = (_g = order.totalTaxPresentment) === null || _g === void 0 ? void 0 : _g.amount) !== null && _h !== void 0 ? _h : '',
+                amount: (_k = (_j = order.totalTaxPresentment) === null || _j === void 0 ? void 0 : _j.amount) !== null && _k !== void 0 ? _k : '',
                 fractionDigits: 2,
             }), taxRates: formattedTaxRates }, this.generateReceiptLabels(presentmentLocale, paymentMethod)), this.getPaymentTerminalReceiptInfo(order));
     }

package/lib/types/rerobe-order-types.d.ts

@@ -42,9 +42,6 @@ interface PaymentTerminalReceiptInfo {
 type ReceiptLineItem = {
     title: string;
     price: string;
-    showUnitPrice: boolean;
-    quantity: number;
-    unitPrice: string;
 };
 interface ReceiptLabels {
     receiptLabel: string;
@@ -66,8 +63,10 @@ type ReceiptObj = {
     organizationNumber: string;
     primaryDomain: string;
     orderDate: string;
+    receiptNumber: string;
     lineItems: ReceiptLineItem[];
     subTotal: string;
+    total: string;
     amountPaid: string;
     tax: string;
     taxRates: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "3.8.3",
+  "version": "3.8.5",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",