rerobe-js-orm 3.8.5 → 3.8.6

package/lib/helpers/OrderHelpers.d.ts

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

package/lib/helpers/OrderHelpers.js

@@ -521,7 +521,7 @@ class OrderHelpers {
         const location = (_a = fulfillmentLocations[0]) === null || _a === void 0 ? void 0 : _a.location;
         return (0, Utilities_1.convertAddressInputToFormatted)(location);
     }
-    generateReceiptLabels(locale, paymentMethod, entryMethod = '') {
+    generateReceiptLabels(locale, paymentMethod, entryMode = '') {
         let paymentMethodLabel = translations_1.cardPaymentTranslations[locale] || translations_1.cardPaymentTranslations['en-US'];
         if (paymentMethod === order_constants_1.PAYMENT_TYPES.cash) {
             paymentMethodLabel = translations_1.cashTranslations[locale] || translations_1.cashTranslations['en-US'];
@@ -529,10 +529,10 @@ class OrderHelpers {
         if (paymentMethod === order_constants_1.PAYMENT_TYPES.mobilePayment) {
             paymentMethodLabel = translations_1.mobilePaymentTranslations[locale] || translations_1.mobilePaymentTranslations['en-US'];
         }
-        let entryMethodLabel = '';
+        let entryModeLabel = '';
         const contactlessRegex = /contactless|kontaktlos|kontaktløs|kontaktlös|contact-less/i;
-        if (contactlessRegex.test(entryMethod)) {
-            entryMethodLabel = translations_1.contactlessTranslations[locale] || translations_1.contactlessTranslations['en-US'];
+        if (contactlessRegex.test(entryMode.toLowerCase())) {
+            entryModeLabel = translations_1.contactlessTranslations[locale] || translations_1.contactlessTranslations['en-US'];
         }
         return {
             receiptLabel: translations_1.receiptTranslations[locale] || translations_1.receiptTranslations['en-US'],
@@ -542,11 +542,11 @@ class OrderHelpers {
             authorizationCodeLabel: translations_1.authorizationCodeTranslations[locale] || translations_1.authorizationCodeTranslations['en-US'],
             referenceLabel: translations_1.referenceTranslations[locale] || translations_1.referenceTranslations['en-US'],
             paymentMethodLabel,
-            entryMethodLabel,
+            entryModeLabel,
         };
     }
     buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl = '', receiptNumber = '', }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         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);
@@ -628,26 +628,28 @@ class OrderHelpers {
             }
             return address;
         };
-        const paymentMethod = (_b = order.paymentMethod) !== null && _b !== void 0 ? _b : '';
+        const paymentTerminalInfo = this.getPaymentTerminalReceiptInfo(order);
+        const receiptLabels = this.generateReceiptLabels(presentmentLocale, (_b = order.paymentType) !== null && _b !== void 0 ? _b : '', (_c = paymentTerminalInfo.entryMode) !== null && _c !== void 0 ? _c : '');
         return Object.assign(Object.assign({ merchantLogoUrl, merchantName: legalName, storeAddress: buildStoreAddress(), phone,
             contactEmail,
-            organizationNumber, primaryDomain: `https://${primaryDomain}`, orderDate: (0, Utilities_1.getFormattedTimestamp)(presentmentLocale), receiptNumber, lineItems: buildLineItems(), subTotal: (0, Utilities_1.formatPrice)({
+            organizationNumber,
+            primaryDomain, storeUrl: `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 : '',
+                amount: (_e = (_d = order.subtotalPricePresentment) === null || _d === void 0 ? void 0 : _d.amount) !== null && _e !== void 0 ? _e : '',
                 fractionDigits: 2,
             }), total: (0, Utilities_1.formatPrice)({
                 currencyCode,
-                amount: (_f = (_e = order.totalPricePresentment) === null || _e === void 0 ? void 0 : _e.amount) !== null && _f !== void 0 ? _f : '',
+                amount: (_g = (_f = order.totalPricePresentment) === null || _f === void 0 ? void 0 : _f.amount) !== null && _g !== void 0 ? _g : '',
                 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 : '',
+                amount: (_j = (_h = order.totalPricePresentment) === null || _h === void 0 ? void 0 : _h.amount) !== null && _j !== void 0 ? _j : '',
                 fractionDigits: 2,
             }), tax: (0, Utilities_1.formatPrice)({
                 currencyCode,
-                amount: (_k = (_j = order.totalTaxPresentment) === null || _j === void 0 ? void 0 : _j.amount) !== null && _k !== void 0 ? _k : '',
+                amount: (_l = (_k = order.totalTaxPresentment) === null || _k === void 0 ? void 0 : _k.amount) !== null && _l !== void 0 ? _l : '',
                 fractionDigits: 2,
-            }), taxRates: formattedTaxRates }, this.generateReceiptLabels(presentmentLocale, paymentMethod)), this.getPaymentTerminalReceiptInfo(order));
+            }), taxRates: formattedTaxRates }, paymentTerminalInfo), receiptLabels);
     }
 }
 exports.default = OrderHelpers;

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

@@ -49,7 +49,7 @@ interface ReceiptLabels {
     taxLabel: string;
     purchaseLabel: string;
     paymentMethodLabel: string;
-    entryMethodLabel: string;
+    entryModeLabel: string;
     authorizationCodeLabel: string;
     referenceLabel: string;
 }
@@ -62,6 +62,7 @@ type ReceiptObj = {
     contactEmail: string;
     organizationNumber: string;
     primaryDomain: string;
+    storeUrl: string;
     orderDate: string;
     receiptNumber: string;
     lineItems: ReceiptLineItem[];

package/package.json

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