rerobe-js-orm 3.8.5 → 3.8.7

package/lib/factories/Order/OrderFromFormState.js

@@ -5,7 +5,7 @@ const Order_1 = require("../../models/Order");
 const order_constants_1 = require("../../constants/order-constants");
 class OrderFromFormState extends OrderFactory_1.default {
     createOrder(fs) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const customerAttr = {
@@ -98,12 +98,14 @@ class OrderFromFormState extends OrderFactory_1.default {
             fulfillmentStatus: fs.fields.fulfillmentStatus.selectedValue,
             statusUrl: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.statusUrl) || '',
         };
-        const orderAttributes = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, totalPricesAttr), presentmentTotalPricesAttr), discountsAttr), shippingAndLocationAttr), customerAttr), statusesAttr), { id: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.id) || '', documentId: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.documentId) || '', name: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.name) || '', orderNumber: (_o = fs.props) === null || _o === void 0 ? void 0 : _o.orderNumber, ribbnOrderNumber: (_p = fs.props) === null || _p === void 0 ? void 0 : _p.ribbnOrderNumber, merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '', currencyCode: fs.fields.currencyCode.inputValue, lineItems: fs.fields.lineItems.selectedValues || [], fulfillments: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.fulfillments) || [], refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [], paymentType: fs.fields.paymentType.selectedValue, paymentMethod: fs.fields.paymentMethod.selectedValue || '', paymentDetails: fs.fields.paymentDetails.selectedValue || {}, notes: fs.fields.notes.inputValue || '', tags: fs.fields.tags.selectedValues || [], cancelReason: fs.fields.cancelReason.selectedValue || '', canceledAt: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.canceledAt) || '', processedAt: ((_u = fs.props) === null || _u === void 0 ? void 0 : _u.processedAt) || new Date().toUTCString(), adjustments: ((_v = fs.props) === null || _v === void 0 ? void 0 : _v.adjustments) || [], createdAtTimestamp: 0, updatedAtTimestamp: 0, createdByUserId: ((_w = fs.props) === null || _w === void 0 ? void 0 : _w.createdByUserId) || '', taxTitle: fs.fields.taxTitle.inputValue || '' }), (((_x = fs.props) === null || _x === void 0 ? void 0 : _x.zettleTransactionObj) && {
+        const orderAttributes = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, totalPricesAttr), presentmentTotalPricesAttr), discountsAttr), shippingAndLocationAttr), customerAttr), statusesAttr), { id: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.id) || '', documentId: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.documentId) || '', name: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.name) || '', orderNumber: (_o = fs.props) === null || _o === void 0 ? void 0 : _o.orderNumber, ribbnOrderNumber: (_p = fs.props) === null || _p === void 0 ? void 0 : _p.ribbnOrderNumber, merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '', currencyCode: fs.fields.currencyCode.inputValue, lineItems: fs.fields.lineItems.selectedValues || [], fulfillments: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.fulfillments) || [], refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [], paymentType: fs.fields.paymentType.selectedValue, paymentMethod: fs.fields.paymentMethod.selectedValue || '', paymentDetails: fs.fields.paymentDetails.selectedValue || {}, notes: fs.fields.notes.inputValue || '', tags: fs.fields.tags.selectedValues || [], cancelReason: fs.fields.cancelReason.selectedValue || '', canceledAt: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.canceledAt) || '', processedAt: ((_u = fs.props) === null || _u === void 0 ? void 0 : _u.processedAt) || new Date().toUTCString(), adjustments: ((_v = fs.props) === null || _v === void 0 ? void 0 : _v.adjustments) || [], createdAtTimestamp: 0, updatedAtTimestamp: 0, createdByUserId: ((_w = fs.props) === null || _w === void 0 ? void 0 : _w.createdByUserId) || '', taxTitle: fs.fields.taxTitle.inputValue || '' }), (((_x = fs.props) === null || _x === void 0 ? void 0 : _x.zettleTransactionObj) && {
             zettleTransactionObj: (_y = fs.props) === null || _y === void 0 ? void 0 : _y.zettleTransactionObj,
         })), (((_z = fs.props) === null || _z === void 0 ? void 0 : _z.paymentIntentObj) && {
             paymentIntentObj: (_0 = fs.props) === null || _0 === void 0 ? void 0 : _0.paymentIntentObj,
         })), (((_1 = fs.props) === null || _1 === void 0 ? void 0 : _1.paymentIntentId) && {
             paymentIntentId: (_2 = fs.props) === null || _2 === void 0 ? void 0 : _2.paymentIntentId,
+        })), (((_3 = fs.props) === null || _3 === void 0 ? void 0 : _3.receiptObj) && {
+            receiptObj: (_4 = fs.props) === null || _4 === void 0 ? void 0 : _4.receiptObj,
         }));
         return new Order_1.default(Object.assign({}, orderAttributes));
     }

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

@@ -471,7 +471,7 @@ class OrderHelpers {
         };
     }
     getPaymentTerminalReceiptInfo(payload) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
         let aid = '';
         let tvr = '';
         let authorizationCode = '';
@@ -496,10 +496,12 @@ class OrderHelpers {
             tvr = (_1 = (_0 = (_z = (_y = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _y === void 0 ? void 0 : _y.cardPresentDetails) === null || _z === void 0 ? void 0 : _z.receipt) === null || _0 === void 0 ? void 0 : _0.terminalVerificationResults) !== null && _1 !== void 0 ? _1 : '';
             authorizationCode = (_5 = (_4 = (_3 = (_2 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _2 === void 0 ? void 0 : _2.cardPresentDetails) === null || _3 === void 0 ? void 0 : _3.receipt) === null || _4 === void 0 ? void 0 : _4.authorizationCode) !== null && _5 !== void 0 ? _5 : '';
             entryMode = (_8 = (_7 = (_6 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _6 === void 0 ? void 0 : _6.cardPresentDetails) === null || _7 === void 0 ? void 0 : _7.readMethod) !== null && _8 !== void 0 ? _8 : '';
-            applicationName = (_12 = (_11 = (_10 = (_9 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _9 === void 0 ? void 0 : _9.cardPresentDetails) === null || _10 === void 0 ? void 0 : _10.receipt) === null || _11 === void 0 ? void 0 : _11.applicationPreferredName) !== null && _12 !== void 0 ? _12 : '';
-            cardBrand = (_15 = (_14 = (_13 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _13 === void 0 ? void 0 : _13.cardPresentDetails) === null || _14 === void 0 ? void 0 : _14.brand) !== null && _15 !== void 0 ? _15 : '';
-            lastFour = (_18 = (_17 = (_16 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _16 === void 0 ? void 0 : _16.cardPresentDetails) === null || _17 === void 0 ? void 0 : _17.last4) !== null && _18 !== void 0 ? _18 : '';
-            referenceNumber = (_19 = charge === null || charge === void 0 ? void 0 : charge.id) !== null && _19 !== void 0 ? _19 : '';
+            applicationName =
+                (_14 = (((_11 = (_10 = (_9 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _9 === void 0 ? void 0 : _9.cardPresentDetails) === null || _10 === void 0 ? void 0 : _10.receipt) === null || _11 === void 0 ? void 0 : _11.applicationPreferredName) ||
+                    ((_13 = (_12 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _12 === void 0 ? void 0 : _12.cardPresentDetails) === null || _13 === void 0 ? void 0 : _13.brand))) !== null && _14 !== void 0 ? _14 : '';
+            cardBrand = (_17 = (_16 = (_15 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _15 === void 0 ? void 0 : _15.cardPresentDetails) === null || _16 === void 0 ? void 0 : _16.brand) !== null && _17 !== void 0 ? _17 : '';
+            lastFour = (_20 = (_19 = (_18 = charge === null || charge === void 0 ? void 0 : charge.paymentMethodDetails) === null || _18 === void 0 ? void 0 : _18.cardPresentDetails) === null || _19 === void 0 ? void 0 : _19.last4) !== null && _20 !== void 0 ? _20 : '';
+            referenceNumber = (_21 = charge === null || charge === void 0 ? void 0 : charge.id) !== null && _21 !== void 0 ? _21 : '';
         }
         return {
             aid,
@@ -521,7 +523,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 +531,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 +544,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 +630,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/models/Order.d.ts

@@ -109,6 +109,7 @@ export default class Order extends Base {
     zettleTransactionObj?: ZettleTransactionObj;
     paymentIntentObj?: any;
     paymentIntentId?: string;
+    receiptObj?: ReceiptObj;
     constructor(props?: any);
     toObj(): ReRobeOrderObj;
     generateSchemaForTypesense(name?: string): {

package/lib/models/Order.js

@@ -138,6 +138,9 @@ class Order extends Base_1.default {
         if (props === null || props === void 0 ? void 0 : props.paymentIntentId) {
             this.paymentIntentId = props.paymentIntentId;
         }
+        if (props === null || props === void 0 ? void 0 : props.receiptObj) {
+            this.receiptObj = props.receiptObj;
+        }
     }
     toObj() {
         const orderObj = {
@@ -223,6 +226,9 @@ class Order extends Base_1.default {
         if (this.paymentIntentId) {
             orderObj.paymentIntentId = this.paymentIntentId;
         }
+        if (this.receiptObj) {
+            orderObj.receiptObj = this.receiptObj;
+        }
         return orderObj;
     }
     generateSchemaForTypesense(name = 'prod_orders_20220809') {

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[];
@@ -143,6 +144,7 @@ type ReRobeOrderObj = {
     zettleTransactionObj?: ZettleTransactionObj;
     paymentIntentObj?: any;
     paymentIntentId?: string;
+    receiptObj?: ReceiptObj;
 };
 type OrderWithRefundsAndFulfillmentsInfoObj = {
     documentId?: string;

package/package.json

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