@pmcretail/mapper-library 0.0.13 → 0.0.15

package/fesm2015/pmcretail-mapper-library.js

@@ -3556,7 +3556,7 @@ class RJMapperBuilderClass {
         (/** @type {?} */ (this)).rjObject['Header'].OriginatedBy.TerminalNumber = (/** @type {?} */ (this)).terminalNumber;
         (/** @type {?} */ (this)).rjObject['Header'].OriginatedBy.TransactionNumber = (/** @type {?} */ (this)).transactionNumber;
         (/** @type {?} */ (this)).rjObject['Header'].TaxMethodID = (/** @type {?} */ (this)).taxMethodId;
-        (/** @type {?} */ (this)).rjObject['Header'].DynamicStockLookup = (/** @type {?} */ (this)).generateDynamicStockLookUp(); //todo
+        (/** @type {?} */ (this)).rjObject['Header'].DynamicStockLookup = (/** @type {?} */ (this)).generateDynamicStockLookUp();
         (/** @type {?} */ (this)).rjObject['Header'].BasketLanguageID = (/** @type {?} */ (this)).basketLanguageId; //todo
         (/** @type {?} */ (this)).rjObject['Header'].BasketCountryID = (/** @type {?} */ (this)).basketCountryId; //todo
         (/** @type {?} */ (this)).rjObject['Header'].BasketCurrencyID = (/** @type {?} */ (this)).transactionDocument.baseCurrency;
@@ -3572,6 +3572,11 @@ class RJMapperBuilderClass {
      * @return {THIS}
      */
     rjMapper() {
+        /** @type {?} */
+        var transactionDiscount = [];
+        if ((/** @type {?} */ (this)).transactionDocument.basket.transactionDiscount && (/** @type {?} */ (this)).transactionDocument.basket.transactionDiscount.length > 0) {
+            transactionDiscount = (/** @type {?} */ (this)).transactionDocument.basket.transactionDiscount;
+        }
         if ((/** @type {?} */ (this)).transactionDocument.type === TRANSACTION_TYPE.SALE) {
             (/** @type {?} */ (this)).rjObject['ProductSale'] = [];
             (/** @type {?} */ (this)).rjObject['ModifierItem'] = [];
@@ -3597,7 +3602,7 @@ class RJMapperBuilderClass {
                     }
                 }
                 /** @type {?} */
-                let data = (/** @type {?} */ (this)).addProduct(element, (lineDiscount.length > 0 ? lineDiscount[0] : null));
+                let data = (/** @type {?} */ (this)).addProduct(element, (lineDiscount.length > 0 ? lineDiscount[0] : null), (transactionDiscount.length > 0 ? transactionDiscount : null));
                 (/** @type {?} */ (this)).rjObject['ProductSale'].push(data);
                 (/** @type {?} */ (this)).getModifierItem(lineDiscount.length > 0 ? lineDiscount[0] : null, element.itemLineId);
             }));
@@ -3617,7 +3622,7 @@ class RJMapperBuilderClass {
              */
             (element) => {
                 /** @type {?} */
-                let data = (/** @type {?} */ (this)).returnProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null));
+                let data = (/** @type {?} */ (this)).returnProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null), (transactionDiscount.length > 0 ? transactionDiscount : null));
                 (/** @type {?} */ (this)).rjObject['ProductReturn'].push(data);
                 (/** @type {?} */ (this)).getModifierItem(element.lineDiscount, element.itemLineId);
             }));
@@ -3633,7 +3638,7 @@ class RJMapperBuilderClass {
              */
             (element) => {
                 /** @type {?} */
-                let data = (/** @type {?} */ (this)).returnProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null));
+                let data = (/** @type {?} */ (this)).returnProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null), (transactionDiscount.length > 0 ? transactionDiscount : null));
                 /** @type {?} */
                 let obj = {
                     "OriginalReceiptSupplied": 0,
@@ -3660,7 +3665,7 @@ class RJMapperBuilderClass {
             (element) => {
                 if (element.refundedQuantity > 0) {
                     /** @type {?} */
-                    let returnProduct = (/** @type {?} */ (this)).returnProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null));
+                    let returnProduct = (/** @type {?} */ (this)).returnProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null), (transactionDiscount.length > 0 ? transactionDiscount : null));
                     /** @type {?} */
                     let obj = {
                         "OriginalReceiptSupplied": 0,
@@ -3674,7 +3679,7 @@ class RJMapperBuilderClass {
                 }
                 else {
                     /** @type {?} */
-                    let addProduct = (/** @type {?} */ (this)).addProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null));
+                    let addProduct = (/** @type {?} */ (this)).addProduct(element, (element.hasOwnProperty('lineDiscount') ? element.lineDiscount : null), (transactionDiscount.length > 0 ? transactionDiscount : null));
                     (/** @type {?} */ (this)).rjObject['ProductSale'].push(addProduct);
                 }
                 (/** @type {?} */ (this)).getModifierItem(element.lineDiscount, element.itemLineId);
@@ -3698,18 +3703,24 @@ class RJMapperBuilderClass {
         (element) => {
             /** @type {?} */
             let obj = {};
-            obj['XMLSchemaVersion'] = "1";
-            obj['NetValue'] = (/** @type {?} */ (this)).convertToString(element.discountAmount < 0 ? element.discountAmount : -element.discountAmount);
-            obj['EffectiveNetValue'] = (/** @type {?} */ (this)).convertToString(element.discountAmount < 0 ? element.discountAmount : -element.discountAmount);
+            obj['XMLSchemaVersion'] = (/** @type {?} */ (this)).xmlSchemaVersion;
+            obj['NetValue'] = (/** @type {?} */ (this)).convertToString(element.discountAmount * -1);
+            obj['EffectiveNetValue'] = (/** @type {?} */ (this)).convertToString(element.discountAmount * -1);
             obj['Description'] = element.reasonDisplayText;
             obj['UserID'] = (/** @type {?} */ (this)).transactionDocument.userName;
             obj['ReasonCodeID'] = element.reasonCode;
-            obj['DiscountType'] = (/** @type {?} */ (this)).convertToString(element.discountType.toUpperCase() == DISCOUNTTYPE.PERCENT.toUpperCase() ? 0 : 1); // todo - compare values 
+            obj['DiscountType'] = (/** @type {?} */ (this)).convertToString(element.discountType.toUpperCase() == DISCOUNTTYPE.PERCENT.toUpperCase() ? 0 : 1);
             obj['RoundingRule'] = (/** @type {?} */ (this)).convertToString(2);
             obj['ModifiedLineNumber'] = element.itemLineIds;
             obj['LineNumber'] = (/** @type {?} */ (this)).convertToString((/** @type {?} */ (this)).generateLineNumber());
-            // obj['DiscountedValue'] = obj['discountAmount'] // todo - confirm value before discount;
-            // obj['DiscountPercentage'] = obj['discountAmount'] / 100 ; // todo - optional
+            obj['DiscountedValue'] = (/** @type {?} */ (this)).transactionDocument.basketSummary.basketTotal + (/** @type {?} */ (this)).transactionDocument.basketSummary.discountTotal;
+            if (element.discountType.toUpperCase() == DISCOUNTTYPE.PERCENT.toUpperCase()) {
+                obj['DiscountPercentage'] = (/** @type {?} */ (this)).convertToString((element.discountAmount / (/** @type {?} */ (this)).transactionDocument.basketSummary.basketTotal).toFixed(1));
+            }
+            if ((/** @type {?} */ (this)).transactionDocument.type === 'REFUND') {
+                obj['NetValue'] = (/** @type {?} */ (this)).convertToString(element.discountAmount < 0 ? -element.discountAmount : element.discountAmount);
+                obj['EffectiveNetValue'] = (/** @type {?} */ (this)).convertToString(element.discountAmount < 0 ? -element.discountAmount : element.discountAmount);
+            }
             (/** @type {?} */ (this)).rjObject['BasketDiscount'].push(obj);
         }));
         return (/** @type {?} */ (this));
@@ -3776,51 +3787,94 @@ class RJMapperBuilderClass {
             obj['TaxPercentage'] = element.VAT.toFixed(2); // todo
             (/** @type {?} */ (this)).rjObject['Trailer']['TaxItem'].push(obj);
         }));
-        // TODO: make Trailer object from promotion       
-        if ((/** @type {?} */ (this)).transactionDocument.basket.linePromotion.length > 0) {
+        if ((/** @type {?} */ (this)).transactionDocument.basket.linePromotion.length > 0 || (/** @type {?} */ (this)).transactionDocument.basket.linePromotion.length > 0) {
             (/** @type {?} */ (this)).rjObject['Trailer']['PromotionItem'] = [];
-            (/** @type {?} */ (this)).transactionDocument.basket.linePromotion.forEach((/**
-             * @param {?} element
-             * @return {?}
-             */
-            (element) => {
-                console.log('element', element);
-                /** @type {?} */
-                let obj = {};
-                obj['PromotionID'] = element.promotionId;
-                obj['PromotionSaving'] = element.promotionAmount < 0 ? element.promotionAmount : -element.promotionAmount;
-                obj['PromotionQuantity'] = ""; // todo - not avaialble
-                obj['PromotionDescription'] = element.displayText;
-                obj['PromotionHit'] = {};
-                obj['PromotionHit']['XMLSchemaVersion'] = (/** @type {?} */ (this)).xmlSchemaVersion;
-                obj['PromotionHit']['HitNumber'] = ""; // todo;
-                obj['PromotionHit']['HitQuantity'] = ""; // todo;
-                obj['PromotionHit']['HitSaving'] = ""; // todo;
-                obj['PromotionHit']['PromotionTrigger'] = {};
-                element.trigger.forEach((/**
-                 * @param {?} subElement
+            if ((/** @type {?} */ (this)).transactionDocument.basket.linePromotion.length > 0) {
+                (/** @type {?} */ (this)).transactionDocument.basket.linePromotion.forEach((/**
+                 * @param {?} element
                  * @return {?}
                  */
-                (subElement) => {
+                (element) => {
+                    /** @type {?} */
+                    let obj = {};
+                    obj['PromotionID'] = element.promotionId;
+                    obj['PromotionSaving'] = element.promotionAmount < 0 ? element.promotionAmount : -element.promotionAmount;
+                    obj['PromotionQuantity'] = "1";
+                    obj['PromotionDescription'] = element.displayText;
+                    obj['PromotionHit'] = {};
+                    obj['PromotionHit']['XMLSchemaVersion'] = (/** @type {?} */ (this)).xmlSchemaVersion;
+                    obj['PromotionHit']['HitNumber'] = "1";
+                    obj['PromotionHit']['HitQuantity'] = "1";
+                    obj['PromotionHit']['HitSaving'] = element.promotionAmount < 0 ? element.promotionAmount : -element.promotionAmount;
+                    obj['PromotionHit']['PromotionTrigger'] = {};
                     /** @type {?} */
                     let product = (/** @type {?} */ (this)).transactionDocument.basket.products.find((/**
                      * @param {?} item
                      * @return {?}
                      */
-                    (item) => item.itemLineId == subElement.itemLineId));
+                    (item) => item.itemLineId == element.itemLineId));
                     obj['PromotionHit']['PromotionTrigger']['XMLSchemaVersion'] = (/** @type {?} */ (this)).xmlSchemaVersion;
                     obj['PromotionHit']['PromotionTrigger']['ProductID'] = product.SKU;
                     obj['PromotionHit']['PromotionTrigger']['UnitValue'] = (/** @type {?} */ (this)).convertToString(element.promotionLinePrice / product.quantity);
-                    obj['PromotionHit']['PromotionTrigger']['LineNumber'] = (/** @type {?} */ (this)).convertToString(subElement.itemLineId);
-                    obj['PromotionHit']['PromotionTrigger']['Quantity'] = (/** @type {?} */ (this)).convertToString(subElement.quantity.toFixed(1));
+                    obj['PromotionHit']['PromotionTrigger']['LineNumber'] = (/** @type {?} */ (this)).getNumber(product.SKU);
+                    obj['PromotionHit']['PromotionTrigger']['Quantity'] = (/** @type {?} */ (this)).convertToString(product.quantity.toFixed(1));
                     obj['PromotionHit']['PromotionTrigger']['TaxCode'] = (/** @type {?} */ (this)).transactionDocument.basket.taxBreakdown.taxLines.find((/**
                      * @param {?} item
                      * @return {?}
                      */
                     (item) => item.itemLineId == element.itemLineId)).VATCode; // todo
+                    (/** @type {?} */ (this)).rjObject['Trailer']['PromotionItem'].push(obj);
                 }));
-                (/** @type {?} */ (this)).rjObject['Trailer']['PromotionItem'].push(obj);
-            }));
+            }
+            if ((/** @type {?} */ (this)).transactionDocument.basket.transactionPromotion.length > 0) {
+                (/** @type {?} */ (this)).transactionDocument.basket.transactionPromotion.forEach((/**
+                 * @param {?} element
+                 * @return {?}
+                 */
+                (element) => {
+                    /** @type {?} */
+                    let obj = {};
+                    console.log('element');
+                    obj['PromotionID'] = element.promotionId;
+                    obj['PromotionSaving'] = element.promotionAmount < 0 ? element.promotionAmount : -element.promotionAmount;
+                    obj['PromotionQuantity'] = "1";
+                    obj['PromotionDescription'] = element.displayText;
+                    obj['PromotionHit'] = {};
+                    obj['PromotionHit']['XMLSchemaVersion'] = (/** @type {?} */ (this)).xmlSchemaVersion;
+                    obj['PromotionHit']['HitNumber'] = "1";
+                    obj['PromotionHit']['HitQuantity'] = "1";
+                    obj['PromotionHit']['HitSaving'] = element.promotionAmount < 0 ? element.promotionAmount : -element.promotionAmount;
+                    obj['PromotionHit']['PromotionTrigger'] = [];
+                    (/** @type {?} */ (this)).transactionDocument.basket.products.forEach((/**
+                     * @param {?} product
+                     * @return {?}
+                     */
+                    (product) => {
+                        /** @type {?} */
+                        let promotionTrigger = {};
+                        element.itemLineIds.forEach((/**
+                         * @param {?} itemLineId
+                         * @return {?}
+                         */
+                        (itemLineId) => {
+                            if (JSON.stringify(itemLineId) === product.itemLineId) {
+                                promotionTrigger['XMLSchemaVersion'] = (/** @type {?} */ (this)).xmlSchemaVersion;
+                                promotionTrigger['ProductID'] = product.SKU;
+                                promotionTrigger['UnitValue'] = (/** @type {?} */ (this)).convertToString(element.promotionLinePrice / product.quantity);
+                                promotionTrigger['LineNumber'] = (/** @type {?} */ (this)).getNumber(product.SKU);
+                                promotionTrigger['Quantity'] = (/** @type {?} */ (this)).convertToString(product.quantity);
+                                promotionTrigger['TaxCode'] = (/** @type {?} */ (this)).transactionDocument.basket.taxBreakdown.taxLines.find((/**
+                                 * @param {?} item
+                                 * @return {?}
+                                 */
+                                (item) => item.itemLineId == product.itemLineId)).VATCode;
+                                obj['PromotionHit']['PromotionTrigger'].push(promotionTrigger);
+                            }
+                        }));
+                    }));
+                    (/** @type {?} */ (this)).rjObject['Trailer']['PromotionItem'].push(obj);
+                }));
+            }
         }
         return (/** @type {?} */ (this));
     }
@@ -3830,64 +3884,132 @@ class RJMapperBuilderClass {
      * @return {THIS}
      */
     getTenderInfo() {
-        (/** @type {?} */ (this)).rjObject['CashTender'] = [];
         if ((/** @type {?} */ (this)).transactionDocument.paymentDetails && (/** @type {?} */ (this)).transactionDocument.paymentDetails.length > 0) {
             (/** @type {?} */ (this)).transactionDocument.paymentDetails.forEach((/**
              * @param {?} element
              * @return {?}
              */
             (element) => {
-                if (element.paymentType.toUpperCase() === 'GIFT CARD') {
-                    /** @type {?} */
-                    let obj = {
-                        XMLSchemaVersion: (/** @type {?} */ (this)).xmlSchemaVersion,
-                        LineNumber: (/** @type {?} */ (this)).generateLineNumber(),
-                        NetValue: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
-                        EffectiveNetValue: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
-                        Description: (/** @type {?} */ (this)).getDescription(element),
-                        DeviceID: (/** @type {?} */ (this)).deviceId,
-                        UserID: (/** @type {?} */ (this)).transactionDocument.userName,
-                        DateTimeCreated: (/** @type {?} */ (this)).updatedAt,
-                        TenderType: element.externalTenderType ? element.externalTenderType : '',
-                        TenderSubType: element.externalSubTenderType ? element.externalSubTenderType : '',
-                        TenderAmount: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
-                        CurrencyID: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
-                        CurrencyDescription: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
-                        GiftVoucherSalesAllowed: '',
-                        //todo
-                        AllowRechargeableVoucherSales: '',
-                        //todo
-                        GiftVoucherID: ''
-                    };
-                    (/** @type {?} */ (this)).rjObject['CashTender'].push(obj);
+                if (element.externalTenderKey) {
+                    (/** @type {?} */ (this)).rjObject[element.externalTenderKey] = [];
+                    if (element.paymentType.toUpperCase() === 'GIFT CARD') {
+                        /** @type {?} */
+                        let obj = {
+                            XMLSchemaVersion: (/** @type {?} */ (this)).xmlSchemaVersion,
+                            LineNumber: (/** @type {?} */ (this)).generateLineNumber(),
+                            NetValue: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
+                            EffectiveNetValue: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
+                            Description: (/** @type {?} */ (this)).getDescription(element),
+                            DeviceID: (/** @type {?} */ (this)).deviceId,
+                            UserID: (/** @type {?} */ (this)).transactionDocument.userName,
+                            DateTimeCreated: (/** @type {?} */ (this)).updatedAt,
+                            TenderType: element.externalTenderType ? element.externalTenderType : '',
+                            TenderSubType: element.externalSubTenderType ? element.externalSubTenderType : '',
+                            TenderAmount: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
+                            CurrencyID: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            CurrencyDescription: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            GiftVoucherSalesAllowed: '',
+                            //todo
+                            AllowRechargeableVoucherSales: '',
+                            //todo
+                            GiftVoucherID: ''
+                        };
+                        (/** @type {?} */ (this)).rjObject[element.externalTenderKey].push(obj);
+                    }
+                    else {
+                        /** @type {?} */
+                        let obj1 = {
+                            XMLSchemaVersion: "1",
+                            LineNumber: (/** @type {?} */ (this)).generateLineNumber(),
+                            //todo
+                            NetValue: JSON.stringify(-1 * (Math.round(element.amount))),
+                            EffectiveNetValue: JSON.stringify(-1 * (Math.round(element.amount))),
+                            Description: (/** @type {?} */ (this)).getDescription(element),
+                            DeviceID: (/** @type {?} */ (this)).deviceId,
+                            UserID: (/** @type {?} */ (this)).transactionDocument.userName,
+                            DateTimeCreated: (/** @type {?} */ (this)).updatedAt,
+                            TenderType: element.externalTenderType ? element.externalTenderType : '',
+                            TenderSubType: element.externalSubTenderType ? element.externalSubTenderType : '',
+                            TenderAmount: JSON.stringify(-1 * (Math.round(element.amount))),
+                            CurrencyID: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            CurrencyDescription: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            IncludeInTransactionTotalCheck: "1",
+                            AllowRechargeableVoucherSales: "1",
+                            OpenDrawerAtEnd: "1"
+                        };
+                        (/** @type {?} */ (this)).rjObject[element.externalTenderKey].push(obj1);
+                    }
                 }
                 else {
-                    /** @type {?} */
-                    let obj1 = {
-                        XMLSchemaVersion: "1",
-                        LineNumber: (/** @type {?} */ (this)).generateLineNumber(),
-                        //todo
-                        NetValue: JSON.stringify(-1 * (Math.round(element.amount))),
-                        EffectiveNetValue: JSON.stringify(-1 * (Math.round(element.amount))),
-                        Description: (/** @type {?} */ (this)).getDescription(element),
-                        DeviceID: (/** @type {?} */ (this)).deviceId,
-                        UserID: (/** @type {?} */ (this)).transactionDocument.userName,
-                        DateTimeCreated: (/** @type {?} */ (this)).updatedAt,
-                        TenderType: element.externalTenderType ? element.externalTenderType : '',
-                        TenderSubType: element.externalSubTenderType ? element.externalSubTenderType : '',
-                        TenderAmount: JSON.stringify(-1 * (Math.round(element.amount))),
-                        CurrencyID: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
-                        CurrencyDescription: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
-                        IncludeInTransactionTotalCheck: "1",
-                        AllowRechargeableVoucherSales: "1",
-                        OpenDrawerAtEnd: "1"
-                    };
-                    (/** @type {?} */ (this)).rjObject['CashTender'].push(obj1);
+                    (/** @type {?} */ (this)).rjObject['CashTender'] = [];
+                    if (element.paymentType.toUpperCase() === 'GIFT CARD') {
+                        /** @type {?} */
+                        let obj = {
+                            XMLSchemaVersion: (/** @type {?} */ (this)).xmlSchemaVersion,
+                            LineNumber: (/** @type {?} */ (this)).generateLineNumber(),
+                            NetValue: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
+                            EffectiveNetValue: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
+                            Description: (/** @type {?} */ (this)).getDescription(element),
+                            DeviceID: (/** @type {?} */ (this)).deviceId,
+                            UserID: (/** @type {?} */ (this)).transactionDocument.userName,
+                            DateTimeCreated: (/** @type {?} */ (this)).updatedAt,
+                            TenderType: element.externalTenderType ? element.externalTenderType : '',
+                            TenderSubType: element.externalSubTenderType ? element.externalSubTenderType : '',
+                            TenderAmount: (/** @type {?} */ (this)).convertToString(-1 * (/** @type {?} */ (this)).removeDecimal((Math.round(element.amount)))),
+                            CurrencyID: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            CurrencyDescription: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            GiftVoucherSalesAllowed: '',
+                            //todo
+                            AllowRechargeableVoucherSales: '',
+                            //todo
+                            GiftVoucherID: ''
+                        };
+                        (/** @type {?} */ (this)).rjObject['CashTender'].push(obj);
+                    }
+                    else {
+                        /** @type {?} */
+                        let obj1 = {
+                            XMLSchemaVersion: "1",
+                            LineNumber: (/** @type {?} */ (this)).generateLineNumber(),
+                            NetValue: JSON.stringify(-1 * (Math.round(element.amount))),
+                            EffectiveNetValue: JSON.stringify(-1 * (Math.round(element.amount))),
+                            Description: (/** @type {?} */ (this)).getDescription(element),
+                            DeviceID: (/** @type {?} */ (this)).deviceId,
+                            UserID: (/** @type {?} */ (this)).transactionDocument.userName,
+                            DateTimeCreated: (/** @type {?} */ (this)).updatedAt,
+                            TenderType: element.externalTenderType ? element.externalTenderType : '',
+                            TenderSubType: element.externalSubTenderType ? element.externalSubTenderType : '',
+                            TenderAmount: JSON.stringify(-1 * (Math.round(element.amount))),
+                            CurrencyID: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            CurrencyDescription: (/** @type {?} */ (this)).transactionDocument.baseCurrency,
+                            IncludeInTransactionTotalCheck: "1",
+                            AllowRechargeableVoucherSales: "1",
+                            OpenDrawerAtEnd: "1"
+                        };
+                        (/** @type {?} */ (this)).rjObject['CashTender'].push(obj1);
+                    }
                 }
             }));
         }
         return (/** @type {?} */ (this));
     }
+    /**
+     * @param {?} productId
+     * @return {?}
+     */
+    getNumber(productId) {
+        /** @type {?} */
+        let lineNumber;
+        for (let i = 0; i < this.rjObject['ProductSale'].length; i++) {
+            /** @type {?} */
+            const element = this.rjObject['ProductSale'][i];
+            if (JSON.stringify(productId) === JSON.stringify(element.ProductID)) {
+                lineNumber = element.LineNumber;
+                break;
+            }
+        }
+        return lineNumber;
+    }
     /**
      * @return {?}
      */
@@ -4168,9 +4290,10 @@ class RJMapperBuilderClass {
     /**
      * @param {?} element
      * @param {?} lineDiscount
+     * @param {?} transactionDiscount
      * @return {?}
      */
-    returnProduct(element, lineDiscount) {
+    returnProduct(element, lineDiscount, transactionDiscount) {
         /** @type {?} */
         let obj = {};
         /** @type {?} */
@@ -4206,7 +4329,7 @@ class RJMapperBuilderClass {
         obj['DisplayTaxCode'] = ''; // todo
         obj['ProductAttributes'] = ''; //todo - not required
         obj['Perishable'] = this.getAttributes();
-        obj['MMGroupID'] = this.getAttributes();
+        obj['MMGroupID'] = this.getCaregories(element);
         obj['CustomerDetails'] = ""; // todo - blank
         obj['TotalPromotionSaving'] = element['promotionAmount'] || -1; // TODO
         obj['OriginalTaxAmount'] = this.convertToString(this.getOriginalTax(element, taxTotal.VAT) * -1);
@@ -4245,14 +4368,80 @@ class RJMapperBuilderClass {
             obj.ExtendedValue = ((lineDiscount.discountedLinePrice || 0) + lineDiscount.discountAmount) * -1;
             obj.UnitPrice = ((lineDiscount.discountedLinePrice || 0) + lineDiscount.discountAmount) * -1;
         }
+        if (transactionDiscount) {
+            obj['BasketDiscountModifier'] = [];
+            this.transactionDocument.basket.transactionDiscount.forEach((/**
+             * @param {?} e
+             * @return {?}
+             */
+            (e) => {
+                /** @type {?} */
+                let discountObj = {};
+                e.itemLineIds.forEach((/**
+                 * @param {?} x
+                 * @return {?}
+                 */
+                (x) => {
+                    if (x == element.itemLineId) {
+                        /** @type {?} */
+                        var discountAmount = this.convertToString(e.discountAmount * -1);
+                        discountObj.BasketDiscountLineNumber = this.getLineNumber(e, discountAmount);
+                        discountObj.XMLSchemaVersion = this.xmlSchemaVersion;
+                        discountObj.DiscountedValue = this.getDiscountedValue(element.totalLinePrice, e.discountAmount);
+                        obj['BasketDiscountModifier'].push(discountObj);
+                    }
+                }));
+            }));
+            /** @type {?} */
+            var totaltransactionDiscount = 0;
+            obj['BasketDiscountModifier'].forEach((/**
+             * @param {?} value
+             * @return {?}
+             */
+            (value) => {
+                totaltransactionDiscount = totaltransactionDiscount + value.DiscountedValue;
+            }));
+            //update the product price
+            obj['EffectiveNetValue'] = obj.EffectiveNetValue + totaltransactionDiscount;
+        }
+        if (this.transactionDocument.basket.transactionPromotion.length > 0) {
+            obj['PromotionSaving'] = [];
+            this.transactionDocument.basket.transactionPromotion.forEach((/**
+             * @param {?} transactionPromo
+             * @return {?}
+             */
+            (transactionPromo) => {
+                /** @type {?} */
+                let promotionObj = {};
+                transactionPromo.itemLineIds.forEach((/**
+                 * @param {?} itemLineId
+                 * @return {?}
+                 */
+                (itemLineId) => {
+                    if (itemLineId == element.itemLineId) {
+                        promotionObj.ModifierValue = transactionPromo.promotionAmount;
+                        promotionObj.ModifierDateTime = this.transactionDocument.createdAt;
+                        promotionObj.ModifierDescription = transactionPromo.displayText;
+                        promotionObj.XMLSchemaVersion = this.xmlSchemaVersion;
+                        promotionObj.PromotionID = transactionPromo.promotionId;
+                        promotionObj.PromotionDescription = transactionPromo.displayText;
+                        promotionObj.HitNumber = '1';
+                        promotionObj.PromotionHitProductQuantity = this.getQuantity(element);
+                        promotionObj.PromotionHitQuantity = this.getQuantity(element) * -1;
+                        obj['PromotionSaving'].push(promotionObj);
+                    }
+                }));
+            }));
+        }
         return obj;
     }
     /**
      * @param {?} element
      * @param {?} lineDiscount
+     * @param {?} transactionDiscount
      * @return {?}
      */
-    addProduct(element, lineDiscount) {
+    addProduct(element, lineDiscount, transactionDiscount) {
         /** @type {?} */
         let taxTotal = this.transactionDocument.basket['taxBreakdown']['taxLines'].find((/**
          * @param {?} item
@@ -4271,8 +4460,7 @@ class RJMapperBuilderClass {
             DateTimeCreated: this.createdAt,
             ExtendedValue: this.removeDecimal(element.price),
             UnitPrice: this.removeDecimal(element.price),
-            MMGroupID: this.getAttributes(),
-            //todo
+            MMGroupID: this.getCaregories(element),
             Quantity: element.quantity.toFixed(1),
             SalespersonID: this.transactionDocument.userId,
             SalespersonName: this.transactionDocument.userName,
@@ -4281,14 +4469,14 @@ class RJMapperBuilderClass {
              * @return {?}
              */
             (item) => item.itemLineId == element['itemLineId'])).VATCode,
-            TaxModifiable: 1,
+            TaxModifiable: "1",
             //todo
             OriginalTaxAmount: this.convertToString(this.getOriginalTax(element, taxTotal.VAT)),
             TaxAmount: this.convertToString(taxTotal.taxLineTotal),
-            OriginalTaxAmountSet: 1,
+            OriginalTaxAmountSet: "1",
             //todo
             ProductID: element.SKU,
-            HandKeyed: 1,
+            HandKeyed: "1",
             //todo
             CustomerDetails: "",
             Perishable: this.getAttributes()
@@ -4317,7 +4505,7 @@ class RJMapperBuilderClass {
                 obj['PriceOverride'].ModifierReasonID = lineDiscount.priceOverrideReasonCode;
                 obj['PriceOverride'].ModifierReasonDescription = lineDiscount.priceOverrideReasonName;
                 obj['PriceOverride'].AuthorisingUserID = this.transactionDocument.userName;
-                obj['PriceOverride'].XMLSchemaVersion = 1;
+                obj['PriceOverride'].XMLSchemaVersion = this.xmlSchemaVersion;
                 obj['PriceOverride'].NewPrice = this.removeDecimal(lineDiscount.unitPrice);
                 obj['PriceOverride'].OriginalPrice = this.removeDecimal(lineDiscount.discountedLinePrice || 0 + lineDiscount.discountAmount);
             }
@@ -4327,8 +4515,135 @@ class RJMapperBuilderClass {
             obj['ExtendedValue'] = ((lineDiscount.discountedLinePrice || 0) + lineDiscount.discountAmount);
             obj['UnitPrice'] = ((lineDiscount.discountedLinePrice || 0) + lineDiscount.discountAmount);
         }
+        if (transactionDiscount) {
+            obj['BasketDiscountModifier'] = [];
+            this.transactionDocument.basket.transactionDiscount.forEach((/**
+             * @param {?} e
+             * @return {?}
+             */
+            (e) => {
+                /** @type {?} */
+                let discountObj = {};
+                e.itemLineIds.forEach((/**
+                 * @param {?} itemLineId
+                 * @return {?}
+                 */
+                (itemLineId) => {
+                    if (itemLineId == element.itemLineId) {
+                        /** @type {?} */
+                        let discountAmount = this.convertToString(e.discountAmount * -1);
+                        discountObj.XMLSchemaVersion = this.xmlSchemaVersion;
+                        discountObj.DiscountedValue = -(this.getDiscountedValue(element.totalLinePrice, e.discountAmount).toFixed(0));
+                        discountObj.BasketDiscountLineNumber = this.getLineNumber(e, discountAmount);
+                        obj['BasketDiscountModifier'].push(discountObj);
+                    }
+                }));
+            }));
+            /** @type {?} */
+            let totaltransactionDiscount = 0;
+            obj['BasketDiscountModifier'].forEach((/**
+             * @param {?} value
+             * @return {?}
+             */
+            (value) => {
+                totaltransactionDiscount = totaltransactionDiscount + value.DiscountedValue;
+            }));
+            //update the product price
+            obj['EffectiveNetValue'] = obj.EffectiveNetValue + totaltransactionDiscount;
+        }
+        if (this.transactionDocument.basket.transactionPromotion.length > 0 || this.transactionDocument.basket.linePromotion.length > 0) {
+            obj['DistributedPromotionSaving'] = [];
+            if (this.transactionDocument.basket.transactionPromotion.length > 0) {
+                this.transactionDocument.basket.transactionPromotion.forEach((/**
+                 * @param {?} e
+                 * @return {?}
+                 */
+                (e) => {
+                    /** @type {?} */
+                    let promotionObj = {};
+                    e.itemLineIds.forEach((/**
+                     * @param {?} itemLineId
+                     * @return {?}
+                     */
+                    (itemLineId) => {
+                        if (itemLineId == element.itemLineId) {
+                            promotionObj.PromotionID = e.promotionId;
+                            promotionObj.Hit = '1';
+                            promotionObj.Saving = this.getSaving(element.totalLinePrice, e.promotionAmount);
+                            promotionObj.ISaving = this.getSaving(element.totalLinePrice, e.promotionAmount);
+                            obj['DistributedPromotionSaving'].push(promotionObj);
+                        }
+                    }));
+                }));
+            }
+            if (this.transactionDocument.basket.linePromotion.length > 0) {
+                this.transactionDocument.basket.linePromotion.forEach((/**
+                 * @param {?} linePromotion
+                 * @return {?}
+                 */
+                (linePromotion) => {
+                    /** @type {?} */
+                    let promotionObj = {};
+                    if (element.itemLineId == linePromotion.itemLineId) {
+                        promotionObj.PromotionID = linePromotion.promotionId;
+                        promotionObj.Hit = "1";
+                        promotionObj.Saving = linePromotion.promotionLinePrice;
+                        promotionObj.ISaving = linePromotion.promotionLinePrice;
+                        obj['DistributedPromotionSaving'].push(promotionObj);
+                    }
+                }));
+            }
+            /** @type {?} */
+            let transactionPromotion = 0;
+            obj['DistributedPromotionSaving'].forEach((/**
+             * @param {?} value
+             * @return {?}
+             */
+            (value) => {
+                transactionPromotion = transactionPromotion + value.Saving;
+            }));
+            obj['EffectiveNetValue'] = obj.EffectiveNetValue + transactionPromotion;
+        }
         return obj;
     }
+    /**
+     * @param {?} price
+     * @param {?} promotionAmount
+     * @return {?}
+     */
+    getSaving(price, promotionAmount) {
+        /** @type {?} */
+        let Saving = (price * promotionAmount) / this.transactionDocument.basketSummary.saleTotal;
+        return Saving;
+    }
+    /**
+     * @param {?} value
+     * @param {?} discountAmount
+     * @return {?}
+     */
+    getLineNumber(value, discountAmount) {
+        /** @type {?} */
+        let lineNumber;
+        for (let i = 0; i < this.rjObject['BasketDiscount'].length; i++) {
+            /** @type {?} */
+            const element = this.rjObject['BasketDiscount'][i];
+            if (value.reasonCode === element.ReasonCodeID && discountAmount === element.NetValue) {
+                lineNumber = element.LineNumber;
+                break;
+            }
+        }
+        return lineNumber;
+    }
+    /**
+     * @param {?} price
+     * @param {?} discountAmount
+     * @return {?}
+     */
+    getDiscountedValue(price, discountAmount) {
+        /** @type {?} */
+        let DiscountedValue = (price * discountAmount) / this.transactionDocument.basketSummary.saleTotal;
+        return DiscountedValue;
+    }
     /**
      * @param {?} element
      * @param {?} VAT
@@ -4351,7 +4666,7 @@ class RJMapperBuilderClass {
             return value;
         }
         catch (e) {
-            console.log(value, ' can not be converted in string', e);
+            console.log(value, 'can not be converted in string', e);
         }
     }
     /**
@@ -4397,6 +4712,30 @@ class RJMapperBuilderClass {
             return "";
         }
     }
+    /**
+     * @param {?} element
+     * @return {?}
+     */
+    getCaregories(element) {
+        /** @type {?} */
+        let MMGroupId = " ";
+        if (element.categories && element.categories.length > 0) {
+            /** @type {?} */
+            let categories = element.categories.filter((/**
+             * @param {?} x
+             * @return {?}
+             */
+            (x) => x.parentId != ''));
+            /** @type {?} */
+            let value = categories.filter((/**
+             * @param {?} x
+             * @return {?}
+             */
+            (x) => x.id != x.parentId));
+            MMGroupId = value[0].name;
+        }
+        return MMGroupId;
+    }
     /**
      * @param {?} date
      * @return {?}
@@ -4425,21 +4764,18 @@ class RJMapperBuilderClass {
      */
     getTransactionPromotion(transactionPromotion) {
         if (transactionPromotion && transactionPromotion.length > 0) {
-            this.rjObject['BasketDiscount'] = {};
-            this.rjObject['BasketDiscount']['XMLSchemaVersion'] = 1;
-            this.rjObject['BasketDiscount']['LineNumber'] = this.generateLineNumber();
-            this.rjObject['BasketDiscount']['NetValue'] = this.removeDecimal(transactionPromotion[0].promotionLinePrice) * -1;
-            this.rjObject['BasketDiscount']['EffectiveNetValue'] = this.removeDecimal(transactionPromotion[0].promotionLinePrice) * -1;
-            this.rjObject['BasketDiscount']['Description'] = transactionPromotion[0].promotionInfo;
-            this.rjObject['BasketDiscount']['DeviceID'] = this.deviceId;
-            this.rjObject['BasketDiscount']['UserID'] = this.transactionDocument.userName;
-            this.rjObject['BasketDiscount']['DateTimeCreated'] = this.createdAt;
-            this.rjObject['BasketDiscount']['ModifiedLineNumber'] = transactionPromotion[0].itemLineIds;
-            this.rjObject['BasketDiscount']['ReasonCodeID'] = 0;
-            this.rjObject['BasketDiscount']['DiscountType'] = transactionPromotion[0].promotionType == 'TRANSACTION_OFF' ? 1 : 0;
-            this.rjObject['BasketDiscount']['DiscountPercentage'] = 0; //todo
-            this.rjObject['BasketDiscount']['DiscountedValue'] = 0; //todo
-            this.rjObject['BasketDiscount']['RoundingRule'] = 2;
+            this.rjObject['PromoVoucherItem'] = {};
+            this.rjObject['PromoVoucherItem']['XMLSchemaVersion'] = this.xmlSchemaVersion;
+            this.rjObject['PromoVoucherItem']['LineNumber'] = this.generateLineNumber();
+            this.rjObject['PromoVoucherItem']['NetValue'] = this.removeDecimal(transactionPromotion[0].promotionLinePrice) * -1;
+            this.rjObject['PromoVoucherItem']['EffectiveNetValue'] = this.removeDecimal(transactionPromotion[0].promotionLinePrice) * -1;
+            this.rjObject['PromoVoucherItem']['Description'] = transactionPromotion[0].promotionInfo;
+            this.rjObject['PromoVoucherItem']['DeviceID'] = this.deviceId;
+            this.rjObject['PromoVoucherItem']['UserID'] = this.transactionDocument.userName;
+            this.rjObject['PromoVoucherItem']['DateTimeCreated'] = this.createdAt;
+            this.rjObject['PromoVoucherItem']['ProductId'] = ""; //todo
+            this.rjObject['PromoVoucherItem']['SerialNumber'] = ""; //todo
+            this.rjObject['PromoVoucherItem']['MMGroupId'] = "";
         }
     }
     /**