@things-factory/integration-accounting 4.0.0-y.0 → 4.0.4

package/dist-server/controllers/accounting-api/index.js

@@ -40,6 +40,8 @@ class AccountingAPI {
     static createInvoice(accounting, req) { }
     static updateInvoice(accounting, req) { }
     static getPurchaseOrders(accounting, req) { }
+    static getContact(accounting, req) { }
+    static getContacts(accounting, req) { }
     static getItem(accounting, req) { }
     static getItems(accounting, req) { }
     static createItem(accounting, req) { }
@@ -78,6 +80,18 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Object)
 ], AccountingAPI, "getPurchaseOrders", null);
+__decorate([
+    decorators_1.api,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Object)
+], AccountingAPI, "getContact", null);
+__decorate([
+    decorators_1.api,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Object)
+], AccountingAPI, "getContacts", null);
 __decorate([
     decorators_1.api,
     __metadata("design:type", Function),

package/dist-server/controllers/accounting-api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/accounting-api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAuC;AACvC,6CAAwC;AACxC,6CAAkC;AAErB,QAAA,iBAAiB,GAAG;IAC/B,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAA;AAED,MAAa,aAAa;IAGxB,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI;QACxC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG;YAC9B,MAAM;YACN,IAAI;SACL,CAAA;IACH,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAI;QACrB,OAAO,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;QAC3B,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,kBAAO,CAAC,CAAA;QACzC,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAA;IACJ,CAAC;IAGD,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG3C,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG7C,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG7C,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAGjD,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAGvC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAGxC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG3C,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;;AApDnC,uBAAS,GAAG,EAAE,CAAA;AAsBrB;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;sCACuC;AAG3C;IADC,gBAAG;;;;wCACyC;AAG7C;IADC,gBAAG;;;;wCACyC;AAG7C;IADC,gBAAG;;;;4CAC6C;AAGjD;IADC,gBAAG;;;;kCACmC;AAGvC;IADC,gBAAG;;;;mCACoC;AAGxC;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;sCACuC;AAG3C;IADC,gBAAG;;;;qCACsC;AArD5C,sCAsDC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/accounting-api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAuC;AAEvC,6CAAwC;AACxC,6CAAkC;AAErB,QAAA,iBAAiB,GAAG;IAC/B,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAA;AAED,MAAa,aAAa;IAGxB,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI;QACxC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG;YAC9B,MAAM;YACN,IAAI;SACL,CAAA;IACH,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAI;QACrB,OAAO,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;QAC3B,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,kBAAO,CAAC,CAAA;QACzC,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAA;IACJ,CAAC;IAGD,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG3C,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG7C,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG7C,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAGjD,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG3C,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAGvC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAGxC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG1C,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;IAG3C,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAQ,CAAC;;AA1DnC,uBAAS,GAAG,EAAE,CAAA;AAsBrB;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;sCACuC;AAG3C;IADC,gBAAG;;;;wCACyC;AAG7C;IADC,gBAAG;;;;wCACyC;AAG7C;IADC,gBAAG;;;;4CAC6C;AAGjD;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;sCACuC;AAG3C;IADC,gBAAG;;;;kCACmC;AAGvC;IADC,gBAAG;;;;mCACoC;AAGxC;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;qCACsC;AAG1C;IADC,gBAAG;;;;sCACuC;AAG3C;IADC,gBAAG;;;;qCACsC;AA3D5C,sCA4DC"}

package/dist-server/controllers/xero/apis/contact/get-contact.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContact = void 0;
+function getContact() {
+    return {
+        method: 'get',
+        path: '/Contacts/{contactId}',
+        denormalize(req) {
+            const { ContactID: contactId } = req;
+            return {
+                resource: { contactId }
+            };
+        },
+        normalize(res) {
+            const { Contacts: contacts } = res;
+            const { Name: attentionCompany, FirstName, LastName, EmailAddress: email, Addresses, Phones } = contacts[0];
+            const { AddressLine1, AddressLine2, AddressLine3, AddressLine4, City: city, PostalCode: postalCode, Country: country } = Addresses[0];
+            const mergedAddressLine = `${AddressLine1}, ${AddressLine2}, ${AddressLine3} ${AddressLine4}`;
+            return {
+                attentionCompany,
+                attentionTo: FirstName ? `${FirstName} ${LastName}` : null,
+                email,
+                deliveryAddress1: AddressLine1 ? mergedAddressLine : null,
+                billingAddress: AddressLine1 ? mergedAddressLine : null,
+                city: city ? city : null,
+                postalCode: postalCode ? postalCode : null,
+                country: country ? country : null
+            };
+        }
+    };
+}
+exports.getContact = getContact;
+//# sourceMappingURL=get-contact.js.map

package/dist-server/controllers/xero/apis/contact/get-contact.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-contact.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/contact/get-contact.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU;IACxB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,uBAAuB;QAC7B,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;YACpC,OAAO;gBACL,QAAQ,EAAE,EAAE,SAAS,EAAE;aACxB,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YAClC,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAE3G,MAAM,EACJ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EACjB,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;YAChB,MAAM,iBAAiB,GAAW,GAAG,YAAY,KAAK,YAAY,KAAK,YAAY,IAAI,YAAY,EAAE,CAAA;YAErG,OAAO;gBACL,gBAAgB;gBAChB,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI;gBAC1D,KAAK;gBACL,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI;gBACzD,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI;gBACvD,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBACxB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;gBAC1C,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;aAClC,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AArCD,gCAqCC"}

package/dist-server/controllers/xero/apis/contact/get-contacts.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContacts = void 0;
+function getContacts() {
+    return {
+        method: 'get',
+        path: '/Contacts',
+        denormalize(req) {
+            return {
+                payload: Object.assign({}, req)
+            };
+        },
+        normalize(res) {
+            return res;
+        }
+    };
+}
+exports.getContacts = getContacts;
+//# sourceMappingURL=get-contacts.js.map

package/dist-server/controllers/xero/apis/contact/get-contacts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-contacts.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/contact/get-contacts.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW;IACzB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG;YACb,OAAO;gBACL,OAAO,oBACF,GAAG,CACP;aACF,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AAfD,kCAeC"}

package/dist-server/controllers/xero/apis/contact/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./get-contacts"), exports);
+__exportStar(require("./get-contact"), exports);
+//# sourceMappingURL=index.js.map

package/dist-server/controllers/xero/apis/contact/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/contact/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8B;AAC9B,gDAA6B"}

package/dist-server/controllers/xero/apis/index.js

@@ -12,5 +12,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./invoice"), exports);
 __exportStar(require("./item"), exports);
-__exportStar(require("./purchaseOrder"), exports);
+__exportStar(require("./purchase-order"), exports);
+__exportStar(require("./contact"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/controllers/xero/apis/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/controllers/xero/apis/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAyB;AACzB,yCAAsB;AACtB,kDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/controllers/xero/apis/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAyB;AACzB,yCAAsB;AACtB,mDAAgC;AAChC,4CAAyB"}

package/dist-server/controllers/xero/apis/invoice/get-invoice.js

@@ -4,9 +4,11 @@ exports.getInvoice = void 0;
 function getInvoice() {
     return {
         method: 'get',
-        path: '/Invoices/{invoiceNo}',
+        path: '/Invoices/{invoiceId}',
         denormalize(req) {
-            return req;
+            return {
+                resource: { invoiceId: req.invoiceId }
+            };
         },
         normalize(res) {
             return res;

package/dist-server/controllers/xero/apis/invoice/get-invoice.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-invoice.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/invoice/get-invoice.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU;IACxB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,uBAAuB;QAC7B,WAAW,CAAC,GAAG;YACb,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AAXD,gCAWC"}
+{"version":3,"file":"get-invoice.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/invoice/get-invoice.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU;IACxB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,uBAAuB;QAC7B,WAAW,CAAC,GAAG;YACb,OAAO;gBACL,QAAQ,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE;aACvC,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AAbD,gCAaC"}

package/dist-server/controllers/xero/apis/invoice/get-invoices.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoices = void 0;
+const accounting_api_1 = require("../../../accounting-api");
 function getInvoices() {
     return {
         method: 'get',
@@ -10,48 +11,47 @@ function getInvoices() {
                 payload: Object.assign({}, req)
             };
         },
-        normalize(res) {
+        async normalize(res, { accounting }) {
             var { Invoices } = res;
             let results = [];
-            results = Invoices.map(invoice => {
-                var { InvoiceNumber: refNo, Reference: refNo2, DateString, Contact, LineItems } = invoice;
+            results = await Promise.all(Invoices.filter(invoice => invoice.Type === 'ACCREC').map(async (invoice) => {
+                var { InvoiceID } = invoice;
+                var { Invoices } = await accounting_api_1.AccountingAPI.getInvoice(accounting, { invoiceId: InvoiceID });
+                var { InvoiceNumber: refNo, Reference: refNo2, DateString, Contact, LineItems } = Invoices[0];
                 var releaseDate = String(DateString.split('T')[0]);
-                var { ContactID: accountNo, Name: name, Phones, Addresses } = Contact;
-                var addressArr = Addresses.length
-                    ? Addresses.map(address => {
-                        return `${address.AddressLine1} ${address.AddressLine2} ${address.AddressLine3}`;
-                    })
-                    : ['undefined'];
-                var phoneArr = Phones.length
-                    ? Phones.map(phone => {
-                        return `${phone.PhoneCountryCode}${phone.PhoneAreaCode}-${phone.PhoneNumber}`;
-                    })
-                    : ['undefined'];
+                var { ContactID } = Contact;
+                const { attentionCompany, attentionTo, email, deliveryAddress1, billingAddress, city, postalCode, country } = await accounting_api_1.AccountingAPI.getContact(accounting, {
+                    ContactID
+                });
                 var products = LineItems.length
                     ? LineItems.map(item => {
-                        var { ItemCode: sku, LineItemID: batchId, Quantity: releaseQty } = item;
-                        return { product: { sku }, batchId, releaseQty };
+                        var { ItemCode: sku, Quantity: releaseQty } = item;
+                        return { product: { sku }, releaseQty };
                     })
                     : ['undefined'];
                 return {
                     refNo,
                     refNo2,
                     releaseDate,
-                    deliverTo: {
-                        accountNo,
-                        name,
-                        companyName: name,
-                        phone: phoneArr[0],
-                        email: 'null@mail.com',
-                        address: addressArr[0],
-                        billingAddress: addressArr[0]
-                    },
-                    orderInventories: products,
+                    type: 'b2b',
                     exportOption: false,
                     ownTransport: true,
-                    collectionOrderNo: refNo
+                    packingOption: false,
+                    deliverTo: {
+                        attentionTo,
+                        attentionCompany,
+                        email,
+                        deliveryAddress1,
+                        city,
+                        postalCode,
+                        country
+                    },
+                    billTo: {
+                        billingAddress
+                    },
+                    orderInventories: products
                 };
-            });
+            }));
             return results;
         }
     };

package/dist-server/controllers/xero/apis/invoice/get-invoices.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-invoices.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/invoice/get-invoices.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW;IACzB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG;YACb,OAAO;gBACL,OAAO,oBACF,GAAG,CACP;aACF,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,IAAI,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YAEtB,IAAI,OAAO,GAAU,EAAE,CAAA;YAEvB,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC/B,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;gBAEzF,IAAI,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAElD,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;gBAErE,IAAI,UAAU,GAAG,SAAS,CAAC,MAAM;oBAC/B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;wBACtB,OAAO,GAAG,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAA;oBAClF,CAAC,CAAC;oBACJ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;gBAEjB,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM;oBAC1B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;wBACjB,OAAO,GAAG,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW,EAAE,CAAA;oBAC/E,CAAC,CAAC;oBACJ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;gBAEjB,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM;oBAC7B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBACnB,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;wBACvE,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAA;oBAClD,CAAC,CAAC;oBACJ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;gBAEjB,OAAO;oBACL,KAAK;oBACL,MAAM;oBACN,WAAW;oBACX,SAAS,EAAE;wBACT,SAAS;wBACT,IAAI;wBACJ,WAAW,EAAE,IAAI;wBACjB,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;wBAClB,KAAK,EAAE,eAAe;wBACtB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;wBACtB,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;qBAC9B;oBACD,gBAAgB,EAAE,QAAQ;oBAC1B,YAAY,EAAE,KAAK;oBACnB,YAAY,EAAE,IAAI;oBAClB,iBAAiB,EAAE,KAAK;iBACzB,CAAA;YACH,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAChB,CAAC;KACF,CAAA;AACH,CAAC;AAhED,kCAgEC"}
+{"version":3,"file":"get-invoices.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/invoice/get-invoices.ts"],"names":[],"mappings":";;;AAAA,4DAAuD;AAEvD,SAAgB,WAAW;IACzB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG;YACb,OAAO;gBACL,OAAO,oBACF,GAAG,CACP;aACF,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YACjC,IAAI,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YAEtB,IAAI,OAAO,GAAU,EAAE,CAAA;YAEvB,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CACzB,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;gBACxE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;gBAC3B,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,8BAAa,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAA;gBAEvF,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAC7F,IAAI,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAElD,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;gBAE3B,MAAM,EACJ,gBAAgB,EAChB,WAAW,EACX,KAAK,EACL,gBAAgB,EAChB,cAAc,EACd,IAAI,EACJ,UAAU,EACV,OAAO,EACR,GAAG,MAAM,8BAAa,CAAC,UAAU,CAAC,UAAU,EAAE;oBAC7C,SAAS;iBACV,CAAC,CAAA;gBAEF,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM;oBAC7B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBACnB,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;wBAClD,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,CAAA;oBACzC,CAAC,CAAC;oBACJ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;gBAEjB,OAAO;oBACL,KAAK;oBACL,MAAM;oBACN,WAAW;oBACX,IAAI,EAAE,KAAK;oBACX,YAAY,EAAE,KAAK;oBACnB,YAAY,EAAE,IAAI;oBAClB,aAAa,EAAE,KAAK;oBACpB,SAAS,EAAE;wBACT,WAAW;wBACX,gBAAgB;wBAChB,KAAK;wBACL,gBAAgB;wBAChB,IAAI;wBACJ,UAAU;wBACV,OAAO;qBACR;oBACD,MAAM,EAAE;wBACN,cAAc;qBACf;oBACD,gBAAgB,EAAE,QAAQ;iBAC3B,CAAA;YACH,CAAC,CAAC,CACH,CAAA;YACD,OAAO,OAAO,CAAA;QAChB,CAAC;KACF,CAAA;AACH,CAAC;AAzED,kCAyEC"}

package/dist-server/controllers/xero/apis/purchase-order/get-purchase-orders.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPurchaseOrders = void 0;
+function getPurchaseOrders() {
+    return {
+        method: 'get',
+        path: '/PurchaseOrders',
+        denormalize(req) {
+            return {
+                payload: Object.assign({}, req)
+            };
+        },
+        normalize(res) {
+            var { PurchaseOrders } = res;
+            let results = [];
+            results = PurchaseOrders.map(purchaseOrder => {
+                var { PurchaseOrderNumber: refNo, Reference: refNo2, DeliveryDateString, LineItems } = purchaseOrder;
+                var etaDate = DeliveryDateString !== undefined ? String(DeliveryDateString.split('T')[0]) : 'undefined';
+                var products = LineItems.length
+                    ? LineItems.map(item => {
+                        var { ItemCode: sku, Quantity: packQty, UnitAmount: unitPrice } = item;
+                        return { product: { sku }, batchId: refNo, packQty, unitPrice };
+                    })
+                    : ['undefined'];
+                return {
+                    refNo,
+                    refNo2,
+                    etaDate,
+                    ownTransport: true,
+                    importCargo: false,
+                    container: false,
+                    orderProducts: products
+                };
+            });
+            return results;
+        }
+    };
+}
+exports.getPurchaseOrders = getPurchaseOrders;
+//# sourceMappingURL=get-purchase-orders.js.map

package/dist-server/controllers/xero/apis/purchase-order/get-purchase-orders.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-purchase-orders.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/purchase-order/get-purchase-orders.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB;IAC/B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,iBAAiB;QACvB,WAAW,CAAC,GAAG;YACb,OAAO;gBACL,OAAO,oBACF,GAAG,CACP;aACF,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,IAAI,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;YAE5B,IAAI,OAAO,GAAU,EAAE,CAAA;YAEvB,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;gBAC3C,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,aAAa,CAAA;gBAEpG,IAAI,OAAO,GAAG,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;gBAEvG,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM;oBAC7B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBACnB,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;wBACtE,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;oBACjE,CAAC,CAAC;oBACJ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;gBAEjB,OAAO;oBACL,KAAK;oBACL,MAAM;oBACN,OAAO;oBACP,YAAY,EAAE,IAAI;oBAClB,WAAW,EAAE,KAAK;oBAClB,SAAS,EAAE,KAAK;oBAChB,aAAa,EAAE,QAAQ;iBACxB,CAAA;YACH,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAChB,CAAC;KACF,CAAA;AACH,CAAC;AAzCD,8CAyCC"}

package/dist-server/controllers/xero/apis/purchase-order/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./get-purchase-orders"), exports);
+//# sourceMappingURL=index.js.map

package/dist-server/controllers/xero/apis/purchase-order/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/controllers/xero/apis/purchase-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAqC"}

package/dist-server/controllers/xero/xero.js

@@ -12,7 +12,7 @@ class Xero {
         this.config = Object.assign({}, config);
     }
     buildAuthURL(nonce) {
-        const scopes = 'offline_access openid profile email accounting.transactions accounting.settings';
+        const scopes = 'offline_access openid profile email accounting.transactions accounting.settings accounting.contacts';
         const { apiKey, callback: redirectUrl } = this.config;
         return `https://login.xero.com/identity/connect/authorize?response_type=code&client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}`;
     }

package/dist-server/controllers/xero/xero.js.map

@@ -1 +1 @@
-{"version":3,"file":"xero.js","sourceRoot":"","sources":["../../../server/controllers/xero/xero.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xero.js","sourceRoot":"","sources":["../../../server/controllers/xero/xero.ts"],"names":[],"mappings":"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"}

package/dist-server/routers/xero-private-router.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.xeroPrivateRouter = void 0;
+const koa_router_1 = __importDefault(require("koa-router"));
+const env_1 = require("@things-factory/env");
+const shell_1 = require("@things-factory/shell");
+const isPathBaseDomain = !env_1.config.get('subdomain') && !env_1.config.get('useVirtualHostBasedDomain');
+const debug = require('debug')('things-factory:integration-accounting:xero-router');
+exports.xeroPrivateRouter = new koa_router_1.default();
+exports.xeroPrivateRouter.get(`${isPathBaseDomain ? '/domain/:domain' : ''}/callback-private-xero`, async (context, next) => {
+    const { domain } = context.state;
+    const xeroAccountingCookies = context.cookies.get('xero-accounting');
+    const { id, status, message } = JSON.parse(xeroAccountingCookies);
+    context.redirect(`${(0, shell_1.getRedirectSubdomainPath)(context, domain.subdomain)}account-xero/${id}/connect-callback?status=${status}&message=${message}`);
+});
+//# sourceMappingURL=xero-private-router.js.map

package/dist-server/routers/xero-private-router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xero-private-router.js","sourceRoot":"","sources":["../../server/routers/xero-private-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAE/B,6CAA4C;AAC5C,iDAAgE;AAEhE,MAAM,gBAAgB,GAAG,CAAC,YAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,YAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;AAE7F,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,mDAAmD,CAAC,CAAA;AAEtE,QAAA,iBAAiB,GAAG,IAAI,oBAAM,EAAE,CAAA;AAE7C,yBAAiB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,wBAAwB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAClH,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAEhC,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IACpE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IAEjE,OAAO,CAAC,QAAQ,CACd,GAAG,IAAA,gCAAwB,EACzB,OAAO,EACP,MAAM,CAAC,SAAS,CACjB,gBAAgB,EAAE,4BAA4B,MAAM,YAAY,OAAO,EAAE,CAC3E,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist-server/routers/xero-router.js

@@ -7,11 +7,12 @@ exports.xeroRouter = void 0;
 const koa_router_1 = __importDefault(require("koa-router"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
 const env_1 = require("@things-factory/env");
+const shell_1 = require("@things-factory/shell");
 const utils_1 = require("@things-factory/utils");
-const auth_base_1 = require("@things-factory/auth-base");
-const entities_1 = require("../entities");
 const accounting_api_1 = require("../controllers/accounting-api");
+const entities_1 = require("../entities");
 const { apiKey, apiSecret, hostname, callback: redirect_uri } = env_1.config.get('accountingIntegrationXero', {});
 const debug = require('debug')('things-factory:integration-accounting:xero-router');
 exports.xeroRouter = new koa_router_1.default();
@@ -88,13 +89,18 @@ exports.xeroRouter.get('/callback-xero', async (context, next) => {
         };
         var user = await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(userId);
         account = await (0, typeorm_1.getRepository)(entities_1.Account).save(Object.assign(Object.assign(Object.assign({}, account), patch), { updater: user }));
-        var message = 'success to activate';
-        context.redirect(`${hostname.replace('{subdomain}', account.domain.subdomain)}/account-xero/${account.id}/connect-callback?status=${account.status}&message=${message}`);
+        context.cookies.set('xero-accounting', JSON.stringify(Object.assign(Object.assign({}, account), { message: 'success to activate' })), {
+            httpOnly: true
+        });
+        context.redirect((0, shell_1.getUrlFromContext)(context, '/callback-private-xero'));
     }
     catch (err) {
         var message = err.message;
         if (account) {
-            context.redirect(`${hostname.replace('{subdomain}', account.domain.subdomain)}/account-xero/${account.id}/connect-callback?status=${account.status}&message=${message}`);
+            context.cookies.set('xero-accounting', JSON.stringify(Object.assign(Object.assign({}, account), { message })), {
+                httpOnly: true
+            });
+            context.redirect((0, shell_1.getUrlFromContext)(context, '/callback-private-xero'));
             return;
         }
         throw err;

package/dist-server/routers/xero-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"xero-router.js","sourceRoot":"","sources":["../../server/routers/xero-router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xero-router.js","sourceRoot":"","sources":["../../server/routers/xero-router.ts"],"names":[],"mappings":"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"}

package/dist-server/routes.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const xero_private_router_1 = require("./routers/xero-private-router");
 const xero_router_1 = require("./routers/xero-router");
 process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
     globalPublicRouter.use(xero_router_1.xeroRouter.routes(), xero_router_1.xeroRouter.allowedMethods());
 });
+process.on('bootstrap-module-domain-private-route', (app, domainPrivateRouter) => {
+    domainPrivateRouter.use(xero_private_router_1.xeroPrivateRouter.routes(), xero_private_router_1.xeroPrivateRouter.allowedMethods());
+});
 //# sourceMappingURL=routes.js.map

package/dist-server/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,uDAAkD;AAElD,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF,kBAAkB,CAAC,GAAG,CAAC,wBAAU,CAAC,MAAM,EAAE,EAAE,wBAAU,CAAC,cAAc,EAAE,CAAC,CAAA;AAC1E,CAAC,CAAC,CAAA"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,uEAAiE;AACjE,uDAAkD;AAElD,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF,kBAAkB,CAAC,GAAG,CAAC,wBAAU,CAAC,MAAM,EAAE,EAAE,wBAAU,CAAC,cAAc,EAAE,CAAC,CAAA;AAC1E,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF,mBAAmB,CAAC,GAAG,CAAC,uCAAiB,CAAC,MAAM,EAAE,EAAE,uCAAiB,CAAC,cAAc,EAAE,CAAC,CAAA;AACzF,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-accounting",
-  "version": "4.0.0-y.0",
+  "version": "4.0.4",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,19 +25,19 @@
     "test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^4.0.0-y.0",
-    "@things-factory/auth-ui": "^4.0.0-y.0",
-    "@things-factory/biz-base": "^4.0.0-y.0",
-    "@things-factory/code-ui": "^4.0.0-y.0",
-    "@things-factory/context-ui": "^4.0.0-y.0",
-    "@things-factory/grist-ui": "^4.0.0-y.0",
-    "@things-factory/i18n-ui": "^4.0.0-y.0",
-    "@things-factory/integration-ui": "^4.0.0-y.0",
-    "@things-factory/more-ui": "^4.0.0-y.0",
-    "@things-factory/product-base": "^4.0.0-y.0",
-    "@things-factory/resource-ui": "^4.0.0-y.0",
-    "@things-factory/setting-ui": "^4.0.0-y.0",
-    "@things-factory/system-ui": "^4.0.0-y.0",
+    "@things-factory/apptool-ui": "^4.0.4",
+    "@things-factory/auth-ui": "^4.0.4",
+    "@things-factory/biz-base": "^4.0.4",
+    "@things-factory/code-ui": "^4.0.4",
+    "@things-factory/context-ui": "^4.0.4",
+    "@things-factory/grist-ui": "^4.0.1",
+    "@things-factory/i18n-ui": "^4.0.4",
+    "@things-factory/integration-ui": "^4.0.4",
+    "@things-factory/more-ui": "^4.0.4",
+    "@things-factory/product-base": "^4.0.4",
+    "@things-factory/resource-ui": "^4.0.4",
+    "@things-factory/setting-ui": "^4.0.4",
+    "@things-factory/system-ui": "^4.0.4",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0"
   },
@@ -52,5 +52,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "64ee0f6547f90b1386024b975efc3b31a5e381cb"
+  "gitHead": "292d7c4e2675d228d6be474ea6a0525d26ac1657"
 }

package/server/controllers/accounting-api/index.ts

@@ -1,4 +1,5 @@
 import { getRepository } from 'typeorm'
+
 import { Account } from '../../entities'
 import { api } from './decorators'
 
@@ -45,6 +46,12 @@ export class AccountingAPI {
   @api
   static getPurchaseOrders(accounting, req): any {}
 
+  @api
+  static getContact(accounting, req): any {}
+
+  @api
+  static getContacts(accounting, req): any {}
+
   @api
   static getItem(accounting, req): any {}
 

package/server/controllers/xero/apis/contact/get-contact.ts

@@ -0,0 +1,38 @@
+export function getContact() {
+  return {
+    method: 'get',
+    path: '/Contacts/{contactId}',
+    denormalize(req) {
+      const { ContactID: contactId } = req
+      return {
+        resource: { contactId }
+      }
+    },
+    normalize(res) {
+      const { Contacts: contacts } = res
+      const { Name: attentionCompany, FirstName, LastName, EmailAddress: email, Addresses, Phones } = contacts[0]
+
+      const {
+        AddressLine1,
+        AddressLine2,
+        AddressLine3,
+        AddressLine4,
+        City: city,
+        PostalCode: postalCode,
+        Country: country
+      } = Addresses[0]
+      const mergedAddressLine: string = `${AddressLine1}, ${AddressLine2}, ${AddressLine3} ${AddressLine4}`
+
+      return {
+        attentionCompany,
+        attentionTo: FirstName ? `${FirstName} ${LastName}` : null,
+        email,
+        deliveryAddress1: AddressLine1 ? mergedAddressLine : null,
+        billingAddress: AddressLine1 ? mergedAddressLine : null,
+        city: city ? city : null,
+        postalCode: postalCode ? postalCode : null,
+        country: country ? country : null
+      }
+    }
+  }
+}

package/server/controllers/xero/apis/contact/get-contacts.ts

@@ -0,0 +1,16 @@
+export function getContacts() {
+  return {
+    method: 'get',
+    path: '/Contacts',
+    denormalize(req) {
+      return {
+        payload: {
+          ...req
+        }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

package/server/controllers/xero/apis/contact/index.ts

@@ -0,0 +1,2 @@
+export * from './get-contacts'
+export * from './get-contact'

package/server/controllers/xero/apis/index.ts

@@ -1,3 +1,4 @@
 export * from './invoice'
 export * from './item'
-export * from './purchaseOrder'
+export * from './purchase-order'
+export * from './contact'

package/server/controllers/xero/apis/invoice/get-invoice.ts

@@ -1,9 +1,11 @@
 export function getInvoice() {
   return {
     method: 'get',
-    path: '/Invoices/{invoiceNo}',
+    path: '/Invoices/{invoiceId}',
     denormalize(req) {
-      return req
+      return {
+        resource: { invoiceId: req.invoiceId }
+      }
     },
     normalize(res) {
       return res

package/server/controllers/xero/apis/invoice/get-invoices.ts

@@ -1,3 +1,5 @@
+import { AccountingAPI } from '../../../accounting-api'
+
 export function getInvoices() {
   return {
     method: 'get',
@@ -9,56 +11,65 @@ export function getInvoices() {
         }
       }
     },
-    normalize(res) {
+    async normalize(res, { accounting }) {
       var { Invoices } = res
 
       let results: any[] = []
 
-      results = Invoices.map(invoice => {
-        var { InvoiceNumber: refNo, Reference: refNo2, DateString, Contact, LineItems } = invoice
-
-        var releaseDate = String(DateString.split('T')[0])
+      results = await Promise.all(
+        Invoices.filter(invoice => invoice.Type === 'ACCREC').map(async invoice => {
+          var { InvoiceID } = invoice
+          var { Invoices } = await AccountingAPI.getInvoice(accounting, { invoiceId: InvoiceID })
 
-        var { ContactID: accountNo, Name: name, Phones, Addresses } = Contact
+          var { InvoiceNumber: refNo, Reference: refNo2, DateString, Contact, LineItems } = Invoices[0]
+          var releaseDate = String(DateString.split('T')[0])
 
-        var addressArr = Addresses.length
-          ? Addresses.map(address => {
-              return `${address.AddressLine1} ${address.AddressLine2} ${address.AddressLine3}`
-            })
-          : ['undefined']
+          var { ContactID } = Contact
 
-        var phoneArr = Phones.length
-          ? Phones.map(phone => {
-              return `${phone.PhoneCountryCode}${phone.PhoneAreaCode}-${phone.PhoneNumber}`
-            })
-          : ['undefined']
+          const {
+            attentionCompany,
+            attentionTo,
+            email,
+            deliveryAddress1,
+            billingAddress,
+            city,
+            postalCode,
+            country
+          } = await AccountingAPI.getContact(accounting, {
+            ContactID
+          })
 
-        var products = LineItems.length
-          ? LineItems.map(item => {
-              var { ItemCode: sku, LineItemID: batchId, Quantity: releaseQty } = item
-              return { product: { sku }, batchId, releaseQty }
-            })
-          : ['undefined']
+          var products = LineItems.length
+            ? LineItems.map(item => {
+                var { ItemCode: sku, Quantity: releaseQty } = item
+                return { product: { sku }, releaseQty }
+              })
+            : ['undefined']
 
-        return {
-          refNo,
-          refNo2,
-          releaseDate,
-          deliverTo: {
-            accountNo,
-            name,
-            companyName: name,
-            phone: phoneArr[0],
-            email: 'null@mail.com',
-            address: addressArr[0],
-            billingAddress: addressArr[0]
-          },
-          orderInventories: products,
-          exportOption: false,
-          ownTransport: true,
-          collectionOrderNo: refNo
-        }
-      })
+          return {
+            refNo,
+            refNo2,
+            releaseDate,
+            type: 'b2b',
+            exportOption: false,
+            ownTransport: true,
+            packingOption: false,
+            deliverTo: {
+              attentionTo,
+              attentionCompany,
+              email,
+              deliveryAddress1,
+              city,
+              postalCode,
+              country
+            },
+            billTo: {
+              billingAddress
+            },
+            orderInventories: products
+          }
+        })
+      )
       return results
     }
   }

package/server/controllers/xero/apis/{purchaseOrder → purchase-order}/get-purchase-orders.ts

@@ -21,14 +21,8 @@ export function getPurchaseOrders() {
 
         var products = LineItems.length
           ? LineItems.map(item => {
-              var {
-                ItemCode: sku,
-                LineItemID: batchId,
-                Quantity: packQty,
-                UnitAmount: unitPrice,
-                Description: remark
-              } = item
-              return { product: { sku }, batchId, packQty, unitPrice, remark }
+              var { ItemCode: sku, Quantity: packQty, UnitAmount: unitPrice } = item
+              return { product: { sku }, batchId: refNo, packQty, unitPrice }
             })
           : ['undefined']
 

package/server/controllers/xero/xero.ts

@@ -21,7 +21,7 @@ export class Xero {
   }
 
   buildAuthURL(nonce) {
-    const scopes = 'offline_access openid profile email accounting.transactions accounting.settings'
+    const scopes = 'offline_access openid profile email accounting.transactions accounting.settings accounting.contacts'
     const { apiKey, callback: redirectUrl } = this.config
 
     return `https://login.xero.com/identity/connect/authorize?response_type=code&client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}`

package/server/routers/xero-private-router.ts

@@ -0,0 +1,24 @@
+import Router from 'koa-router'
+
+import { config } from '@things-factory/env'
+import { getRedirectSubdomainPath } from '@things-factory/shell'
+
+const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
+
+const debug = require('debug')('things-factory:integration-accounting:xero-router')
+
+export const xeroPrivateRouter = new Router()
+
+xeroPrivateRouter.get(`${isPathBaseDomain ? '/domain/:domain' : ''}/callback-private-xero`, async (context, next) => {
+  const { domain } = context.state
+
+  const xeroAccountingCookies = context.cookies.get('xero-accounting')
+  const { id, status, message } = JSON.parse(xeroAccountingCookies)
+
+  context.redirect(
+    `${getRedirectSubdomainPath(
+      context,
+      domain.subdomain
+    )}account-xero/${id}/connect-callback?status=${status}&message=${message}`
+  )
+})

package/server/routers/xero-router.ts

@@ -1,12 +1,14 @@
 import Router from 'koa-router'
 import fetch from 'node-fetch'
 import { getRepository } from 'typeorm'
+
+import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
+import { getUrlFromContext } from '@things-factory/shell'
 import { parseJwt } from '@things-factory/utils'
-import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
 
+import { ACCOUNTING_STATUS, AccountingAPI } from '../controllers/accounting-api'
 import { Account } from '../entities'
-import { AccountingAPI, ACCOUNTING_STATUS } from '../controllers/accounting-api'
 
 const { apiKey, apiSecret, hostname, callback: redirect_uri } = config.get('accountingIntegrationXero', {})
 
@@ -113,21 +115,34 @@ xeroRouter.get('/callback-xero', async (context, next) => {
       updater: user
     })
 
-    var message = 'success to activate'
-    context.redirect(
-      `${hostname.replace('{subdomain}', account.domain.subdomain)}/account-xero/${
-        account.id
-      }/connect-callback?status=${account.status}&message=${message}`
+    context.cookies.set(
+      'xero-accounting',
+      JSON.stringify({
+        ...account,
+        message: 'success to activate'
+      }),
+      {
+        httpOnly: true
+      }
     )
+
+    context.redirect(getUrlFromContext(context, '/callback-private-xero'))
   } catch (err) {
     var message: string = err.message
 
     if (account) {
-      context.redirect(
-        `${hostname.replace('{subdomain}', account.domain.subdomain)}/account-xero/${
-          account.id
-        }/connect-callback?status=${account.status}&message=${message}`
+      context.cookies.set(
+        'xero-accounting',
+        JSON.stringify({
+          ...account,
+          message
+        }),
+        {
+          httpOnly: true
+        }
       )
+
+      context.redirect(getUrlFromContext(context, '/callback-private-xero'))
       return
     }
 

package/server/routes.ts

@@ -1,5 +1,10 @@
+import { xeroPrivateRouter } from './routers/xero-private-router'
 import { xeroRouter } from './routers/xero-router'
 
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
   globalPublicRouter.use(xeroRouter.routes(), xeroRouter.allowedMethods())
 })
+
+process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {
+  domainPrivateRouter.use(xeroPrivateRouter.routes(), xeroPrivateRouter.allowedMethods())
+})