addio-admin-sdk 1.7.186 → 1.7.187-canary-2

package/.env

@@ -2,13 +2,14 @@ NEXT_PUBLIC_FIREBASE_CONFIG_API_KEY_DEV='AIzaSyBNtwzdIe2__HJD23S87RIbWbIqKQVtFiw
 NEXT_PUBLIC_FIREBASE_CONFIG_API_KEY_PROD='AIzaSyDK6WQZkCrsMGunAPHn9KkdCGPky4hTgL4'
 NEXT_PUBLIC_MESSAGING_SENDER_ID_DEV='188490998694'
 NEXT_PUBLIC_MESSAGING_SENDER_ID_PROD='725873016982'
-NEXT_PUBLIC_FIREBASE_APP_ID_DEV='1:188490998694:web:eecd719e7b18f38d272567'
 NEXT_PUBLIC_FIREBASE_APP_ID_PROD='1:725873016982:web:9b1f6d77819909e19102b7'
+NEXT_PUBLIC_FIREBASE_APP_ID_DEV='1:188490998694:web:eecd719e7b18f38d272567'
 NEXT_PUBLIC_MEASUREMENT_ID_DEV='G-4BB66ZRTWZ'
 NEXT_PUBLIC_MEASUREMENT_ID_PROD='G-BB8HHZ466R'
+
 NEXT_PUBLIC_SERVICE_DATABASE_READ_PROVIDER=nobase
-NEXT_PUBLIC_SERVICE_DATABASE_WRITE_PROVIDER=nobase,firebase
+NEXT_PUBLIC_SERVICE_DATABASE_WRITE_PROVIDER=nobase
 NEXT_PUBLIC_SERVICE_DATABASE_URL=https://db-test.addiocommerce.com/
-NEXT_PUBLIC_SERVICE_DATABASE_TOKEN=$SERVICE_DATABASE_TOKEN
-# NEXT_PUBLIC_API_URL=https://api-test.addiocommerce.com/v1
-NEXT_PUBLIC_API_URL=http://localhost:8080
+NEXT_PUBLIC_API_URL=https://api-test.addiocommerce.com/v1
+NEXT_PUBLIC_SERVICE_DATABASE_TOKEN='337043a374-6f0be-5eb26-05be550631'
+LOCAL_FIRESTORE=false

package/dist/Interfaces/Email/IEmail.d.ts

@@ -7,11 +7,11 @@ export default interface IEmail {
 export declare const getDefaultEmail: (locale?: string) => {
     TemplateModel: {
         shopping_cart_icon: string;
+        check_icon: string;
+        mail_icon: string;
         help_label: string;
         preferences_label: string;
         unsubscribe_label: string;
-        check_icon: string;
-        mail_icon: string;
         socialmedias_items: never[];
     };
 };

package/dist/Interfaces/Email/IEmail.js

@@ -4,32 +4,18 @@ exports.getDefaultEmailTemplateBySpace = exports.getDefaultEmail = void 0;
 const __1 = require("../..");
 const locale_1 = require("../../utils/locale");
 const getDefaultEmail = (locale = 'fr') => {
-    switch (locale) {
-        case 'en':
-            return {
-                TemplateModel: {
-                    shopping_cart_icon: `https://gng-ecr${__1.isTestEnv ? '-test' : ''}.imgix.net/1.0.0/emails_src/shopping_cart_icon.png`,
-                    help_label: 'Contact us',
-                    preferences_label: 'Settings',
-                    unsubscribe_label: 'Unsubscribe',
-                    check_icon: `https://gng-ecr${__1.isTestEnv ? '-test' : ''}.imgix.net/1.0.0/emails_src/check_icon.png`,
-                    mail_icon: `https://gng-ecr${__1.isTestEnv ? '-test' : ''}.imgix.net/1.0.0/emails_src/mail_icon.png`,
-                    socialmedias_items: []
-                }
-            };
-        default:
-            return {
-                TemplateModel: {
-                    shopping_cart_icon: `https://gng-ecr${__1.isTestEnv ? '-test' : ''}.imgix.net/1.0.0/emails_src/shopping_cart_icon.png`,
-                    help_label: 'Nous joindre',
-                    preferences_label: 'Préférences',
-                    unsubscribe_label: 'Se désinscrire',
-                    check_icon: `https://gng-ecr${__1.isTestEnv ? '-test' : ''}.imgix.net/1.0.0/emails_src/check_icon.png`,
-                    mail_icon: `https://gng-ecr${__1.isTestEnv ? '-test' : ''}.imgix.net/1.0.0/emails_src/mail_icon.png`,
-                    socialmedias_items: []
-                }
-            };
-    }
+    const baseImgUrl = `https://${__1.isTestEnv ? 'test' : 'beta'}.ecomm.titanestudio.ca/images/emails`;
+    return {
+        TemplateModel: {
+            shopping_cart_icon: `${baseImgUrl}/shopping_cart_icon.png`,
+            check_icon: `${baseImgUrl}/check_icon.png`,
+            mail_icon: `${baseImgUrl}/mail_icon.png`,
+            help_label: (0, locale_1.translateILang)({ fr: 'Nous joindre', en: 'Contact us' }, locale),
+            preferences_label: (0, locale_1.translateILang)({ fr: 'Préférences', en: 'Settings' }, locale),
+            unsubscribe_label: (0, locale_1.translateILang)({ fr: 'Se désinscrire', en: 'Unsubscribe' }, locale),
+            socialmedias_items: []
+        }
+    };
 };
 exports.getDefaultEmail = getDefaultEmail;
 const getDefaultEmailTemplateBySpace = (space, locale = 'fr') => {

package/dist/Interfaces/Email/IEmail.js.map

@@ -1 +1 @@
-{"version":3,"file":"IEmail.js","sourceRoot":"","sources":["../../../src/Interfaces/Email/IEmail.ts"],"names":[],"mappings":";;;AACA,6BAAiC;AAEjC,+CAA2D;AAQpD,MAAM,eAAe,GAAG,CAAC,SAAiB,IAAI,EAAE,EAAE;IACxD,QAAQ,MAAM,EAAE;QACf,KAAK,IAAI;YACR,OAAO;gBACN,aAAa,EAAE;oBACd,kBAAkB,EAAE,kBACnB,aAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACvB,oDAAoD;oBACpD,UAAU,EAAE,YAAY;oBACxB,iBAAiB,EAAE,UAAU;oBAC7B,iBAAiB,EAAE,aAAa;oBAChC,UAAU,EAAE,kBAAkB,aAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,4CAA4C;oBAClG,SAAS,EAAE,kBAAkB,aAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,2CAA2C;oBAChG,kBAAkB,EAAE,EAAE;iBACtB;aACD,CAAA;QAEF;YACC,OAAO;gBACN,aAAa,EAAE;oBACd,kBAAkB,EAAE,kBACnB,aAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACvB,oDAAoD;oBACpD,UAAU,EAAE,cAAc;oBAC1B,iBAAiB,EAAE,aAAa;oBAChC,iBAAiB,EAAE,gBAAgB;oBACnC,UAAU,EAAE,kBAAkB,aAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,4CAA4C;oBAClG,SAAS,EAAE,kBAAkB,aAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,2CAA2C;oBAChG,kBAAkB,EAAE,EAAE;iBACtB;aACD,CAAA;KACF;AACF,CAAC,CAAA;AAhCY,QAAA,eAAe,mBAgC3B;AAEM,MAAM,8BAA8B,GAAG,CAAC,KAAY,EAAE,SAAiB,IAAI,EAAE,EAAE;IACrF,IAAI,YAAY,GAAsC,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC,aAAa,CAAA;IAC3F,IAAI,aAAa,GAAoC,KAAK,CAAC,IAAI,EAAE,CAAC,aAAa,CAAA;IAC/E,IAAI,CAAC,CAAC,aAAa,EAAE;QACpB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1C;YACC,wBAAwB;YACxB,CAAC,CAAC,aAAa;gBACf,+CAA+C;gBAC/C,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC;gBACpB,qCAAqC;gBACrC,CAAC,CAAC,CAAC,kBAAkB,EAAE,0BAA0B,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9G;gBACD,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;oBACrD,CAAC,CAAC,+BAA+B;wBAC/B,IAAA,+BAAsB,EAAC,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;oBACpD,CAAC,CAAC,gCAAgC;wBAChC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;aAC7B;QACF,CAAC,CAAC,CAAA;QACF,YAAY,mCACR,YAAY,GACZ,aAAa,CAChB,CAAA;KACD;IAED,OAAO;QACN,aAAa,EAAE,YAAY;KAC3B,CAAA;AACF,CAAC,CAAA;AA7BY,QAAA,8BAA8B,kCA6B1C"}
+{"version":3,"file":"IEmail.js","sourceRoot":"","sources":["../../../src/Interfaces/Email/IEmail.ts"],"names":[],"mappings":";;;AACA,6BAAiC;AAEjC,+CAA2E;AAQpE,MAAM,eAAe,GAAG,CAAC,SAAiB,IAAI,EAAE,EAAE;IACxD,MAAM,UAAU,GAAG,WAAW,aAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,sCAAsC,CAAA;IAE/F,OAAO;QACN,aAAa,EAAE;YACd,kBAAkB,EAAE,GAAG,UAAU,yBAAyB;YAC1D,UAAU,EAAE,GAAG,UAAU,iBAAiB;YAC1C,SAAS,EAAE,GAAG,UAAU,gBAAgB;YACxC,UAAU,EAAE,IAAA,uBAAc,EAAC,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,MAAM,CAAC;YAC5E,iBAAiB,EAAE,IAAA,uBAAc,EAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,MAAM,CAAC;YAChF,iBAAiB,EAAE,IAAA,uBAAc,EAAC,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC;YACtF,kBAAkB,EAAE,EAAE;SACtB;KACD,CAAA;AACF,CAAC,CAAA;AAdY,QAAA,eAAe,mBAc3B;AAEM,MAAM,8BAA8B,GAAG,CAAC,KAAY,EAAE,SAAiB,IAAI,EAAE,EAAE;IACrF,IAAI,YAAY,GAAsC,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC,aAAa,CAAA;IAC3F,IAAI,aAAa,GAAoC,KAAK,CAAC,IAAI,EAAE,CAAC,aAAa,CAAA;IAC/E,IAAI,CAAC,CAAC,aAAa,EAAE;QACpB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1C;YACC,wBAAwB;YACxB,CAAC,CAAC,aAAa;gBACf,+CAA+C;gBAC/C,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC;gBACpB,qCAAqC;gBACrC,CAAC,CAAC,CAAC,kBAAkB,EAAE,0BAA0B,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9G;gBACD,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;oBACrD,CAAC,CAAC,+BAA+B;wBAChC,IAAA,+BAAsB,EAAC,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;oBACnD,CAAC,CAAC,gCAAgC;wBACjC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;aAC5B;QACF,CAAC,CAAC,CAAA;QACF,YAAY,mCACR,YAAY,GACZ,aAAa,CAChB,CAAA;KACD;IAED,OAAO;QACN,aAAa,EAAE,YAAY;KAC3B,CAAA;AACF,CAAC,CAAA;AA7BY,QAAA,8BAA8B,kCA6B1C"}

package/dist/lib/Cart/index.d.ts

@@ -162,6 +162,7 @@ export default class Cart extends BaseServiceClass<ICart> {
         usedPromise?: ICartPromiseToPurchase;
         saveToDatabase?: boolean;
         associatedTransferRequests?: TransferRequest[];
+        forceApplyInactivePA?: boolean;
     }) => Promise<this | undefined>;
     private defineWhatICanBe;
     checkDiscountConditions: (discount: IDiscountRule) => boolean;
@@ -274,8 +275,10 @@ export default class Cart extends BaseServiceClass<ICart> {
      * @param escompteItems list of discount products from the dash
      * @param customPriceList list of products with their custom pric from G2
      * @param banksUsedForCart Optionnal. Array of banks_used applied to cart
+     * @param isCartModification Optionnal. Is it a modification process
      */
-    updateWithPromiseToPurchasePrices: (escompteItems: IndexedProduct[], customPriceList?: string | ICustomPriceItem[] | undefined, banksUsedForCart?: IBankUsed[]) => Promise<void>;
+    updateWithPromiseToPurchasePrices: (escompteItems: IndexedProduct[], customPriceList?: string | ICustomPriceItem[] | undefined, banksUsedForCart?: IBankUsed[], isCartModification?: boolean) => Promise<void>;
+    removePromiseToPurchaseFromCart: (customPriceList?: string | ICustomPriceItem[] | undefined) => Promise<void>;
     /**
      * Function canBePaidWithMyPromiseToPurchase
      * @description Check if a cart can be paid with a promise to purchase
@@ -286,7 +289,7 @@ export default class Cart extends BaseServiceClass<ICart> {
      * @param forceCartTypeid Optionnal. A cart type ID to use for bank to apply check, if should be forced
      * @returns true if cart can be paid, false if it cannot
      */
-    canBePaidWithMyPromiseToPurchase: (applicableBanks: IApplicablePromiseBank[], applicableBanksHistory: IIndexedBankUsed[], customPriceList?: string | ICustomPriceItem[] | undefined, contingency?: number | undefined, forcedBankTypeId?: string) => Promise<boolean | ApplyBanksToCartErrorsEnum>;
+    canBePaidWithMyPromiseToPurchase: (applicableBanks: IApplicablePromiseBank[], applicableBanksHistory: IIndexedBankUsed[], customPriceList?: string | ICustomPriceItem[] | undefined, contingency?: number | undefined, forcedBankTypeId?: string, bypassBankAvailability?: boolean) => Promise<boolean | ApplyBanksToCartErrorsEnum>;
     /**
      * Function calculatePotentialRemainingAmountsAndSetBanksUsedAmounts
      * @description Calculate the amounts that would remain in the promise's banks if we paid this cart with the promise and associates the amounts to use in the banks to the cart
@@ -295,7 +298,7 @@ export default class Cart extends BaseServiceClass<ICart> {
      * @param promiseToPurchase the promise to purchase
      * @returns an array of IBankUsed
      */
-    calculatePotentialRemainingAmountsAndSetBanksUsedAmounts: (remainingAmounts: IBankUsed[], applicableBanks: IApplicablePromiseBank[], forcedBankTypeId?: string | undefined) => IBankUsed[];
+    calculatePotentialRemainingAmountsAndSetBanksUsedAmounts: (remainingAmounts: IBankUsed[], applicableBanks: IApplicablePromiseBank[], forcedBankTypeId?: string | undefined, bypassBankAvailability?: boolean) => IBankUsed[];
     private _savePromiseToPurchaseInCart;
     setBankUsed: (bankAmountsUpdated: IBankUsed[]) => void;
     /**
@@ -306,9 +309,11 @@ export default class Cart extends BaseServiceClass<ICart> {
      * @param customPriceList a list of custom price items
      * @param space the space
      * @param forcedCartType Optionnal. If provided, overrides cart type found by check cart item types.
+     * @param isCartModification Optionnal. Pass true when called from the POS order modification flow so escompte lines are rebuilt even on a paid cart.
+     * @param originalPromiseToPurchase Optionnal. The PA the order was originally paid with. In modification, its banks are re-applied even if now disabled.
      * @returns the updated cart and a boolean canBePaid determining if the cart can be paid with the promise or not
      */
-    canBePaidWithPA: (applicableBanks: IApplicablePromiseBank[], customerID: string, customPriceList: ICustomPriceItem[], space: Space, forcedBankTypeId?: string) => Promise<{
+    canBePaidWithPA: (applicableBanks: IApplicablePromiseBank[], customerID: string, customPriceList: ICustomPriceItem[], space: Space, forcedBankTypeId?: string, isCartModification?: boolean, originalPromiseToPurchase?: ICartPromiseToPurchase) => Promise<{
         canBePaid: boolean;
         canBePaidReason?: ApplyBanksToCartErrorsEnum | undefined;
         updatedCart: ICart;

package/dist/lib/Cart/index.js

@@ -60,7 +60,6 @@ const g2_1 = require("../../rules/GR/utils/g2");
 const cart_1 = require("../../utils/cart");
 const promiseToPurchase_1 = require("../../utils/promiseToPurchase");
 const PromiseToPurchase_2 = require("../../Interfaces/PromiseToPurchase");
-const products_2 = require("../../rules/GR/utils/products");
 const baseService_1 = require("../baseService");
 const DatabaseService_1 = __importDefault(require("../../services/database/DatabaseService"));
 const logs_1 = require("../../services/logs");
@@ -1899,6 +1898,7 @@ class Cart extends baseService_1.BaseServiceClass {
             }
         };
         this.saveCartModification = async (partial, oldItems, newItems, currentUser, options = {}) => {
+            var _b, _c, _d, _e, _f, _g;
             // default saveToDatabase to true
             const shouldSaveToDB = typeof options.saveToDatabase == 'boolean' ? options.saveToDatabase : true;
             try {
@@ -1906,46 +1906,45 @@ class Cart extends baseService_1.BaseServiceClass {
                 const space = await Space_2.default.getCurrentSpaceWithRef(this._collection.path, this._user);
                 if (!!!space)
                     throw new Error('could not init space obj');
-                // If the cart is associated to a promise
-                if (!!options.usedPromise) {
-                    for (const bank of options.usedPromise.banks_used) {
-                        const promiseQuery = await space.promisesToPurchase.get({
-                            query: [{ field: 'id', operator: '==', value: bank.promise_id }]
-                        });
-                        // If the promise is closed or doesn't exist, we don't adjust it
-                        if (!!!promiseQuery || !!!promiseQuery.length)
-                            continue;
-                        if (!!promiseQuery[0].data().ending_date)
-                            continue;
-                        // If the bank is inactive, we don't adjust it
-                        const bankInDB = promiseQuery[0].data().banks.find((b) => b.bank_type_id === bank.bank_type_id);
-                        if (!!!bankInDB || !!!bankInDB.active)
-                            continue;
-                        let amountTotal = 0;
-                        const taxes = this.data().total - this.data().subtotal;
-                        if ((0, promiseToPurchase_1.getBankTypeName)(space.bankTypes.get(), bank.bank_type_id) === 'installation') {
-                            amountTotal = Number((0, products_2.getInstallItemPrice)('installation-gazon', itemsForInventory.filter((i) => !!i.is_service)));
-                        }
-                        else {
-                            const itemsWithoutInstallation = itemsForInventory.filter((i) => !!!i.parent_slug || !!!['installation-gazon', 'frais-de-mobilisation'].includes(i.parent_slug));
-                            itemsWithoutInstallation.map((i) => (amountTotal += (0, products_1.getLowestPrice)(i).price.amount * i.qte));
-                            amountTotal += taxes;
+                const beforeBanksUsed = (_c = (_b = options.usedPromise) === null || _b === void 0 ? void 0 : _b.banks_used) !== null && _c !== void 0 ? _c : [];
+                const afterBanksUsed = (_e = (_d = this.data().promise_to_purchase) === null || _d === void 0 ? void 0 : _d.banks_used) !== null && _e !== void 0 ? _e : [];
+                const adjustmentsToApply = (0, promiseToPurchase_1.getModificationBankAdjustments)(beforeBanksUsed, afterBanksUsed, (_f = this.data().ref) !== null && _f !== void 0 ? _f : '');
+                if (shouldSaveToDB && !!adjustmentsToApply.length) {
+                    for (const promiseId of (0, uniq_1.default)(adjustmentsToApply.map((a) => a.promise_id))) {
+                        try {
+                            const promiseQuery = await space.promisesToPurchase.get({
+                                query: [{ field: 'id', operator: '==', value: promiseId }]
+                            });
+                            if (!!!promiseQuery || !!!promiseQuery.length)
+                                continue;
+                            const promise = promiseQuery[0];
+                            if (!options.forceApplyInactivePA && !!promise.data().ending_date)
+                                continue;
+                            let newBanks = promise.data().banks;
+                            let updated = false;
+                            for (const { bank_type_id, adjustment } of adjustmentsToApply.filter((a) => a.promise_id === promiseId)) {
+                                const bankInDB = newBanks.find((b) => b.bank_type_id === bank_type_id);
+                                if (!!!bankInDB || (!options.forceApplyInactivePA && !!!bankInDB.active))
+                                    continue;
+                                const remaining = await space.promisesToPurchase.getSpecificAvailableBankAmount(promiseId, bank_type_id, promise);
+                                const bankNowEmpty = !!remaining && typeof remaining.remaining_amount === 'number'
+                                    ? (0, round_1.default)(remaining.remaining_amount, 3) + (0, round_1.default)(adjustment.amount, 3) < 1
+                                    : false;
+                                const updatedBank = Object.assign(Object.assign(Object.assign({}, bankInDB), { adjustments: [...((_g = bankInDB.adjustments) !== null && _g !== void 0 ? _g : []), Object.assign(Object.assign({}, adjustment), { issued_by: this._user })] }), (!!bankNowEmpty ? { active: false } : {}));
+                                newBanks = newBanks.map((b) => (b.bank_type_id === bank_type_id ? updatedBank : b));
+                                updated = true;
+                            }
+                            if (!!updated) {
+                                const allBanksInactive = newBanks.every((b) => !!!b.active);
+                                await promise.save(Object.assign({ banks: newBanks }, (!!allBanksInactive && !!!promise.data().ending_date ? { ending_date: (0, moment_1.default)().toDate() } : {})));
+                            }
                         }
-                        const adjustment = {
-                            amount: amountTotal * -1,
-                            reason: `Modification de la commande #${this.data().ref}`,
-                            issued_at: new Date(),
-                            issued_by: !!currentUser ? currentUser : (0, services_1.getDefaultSpaceUserEmail)(space.data().id)
-                        };
-                        const remainingAmount = await space.promisesToPurchase.getSpecificAvailableBankAmount(bank.promise_id, bank.bank_type_id, promiseQuery[0]);
-                        let newRemainingAmount;
-                        if (!!remainingAmount && !!remainingAmount.remaining_amount) {
-                            newRemainingAmount = (0, round_1.default)(remainingAmount.remaining_amount, 3) + (0, round_1.default)(adjustment.amount);
+                        catch (e) {
+                            console.log('error on adjusting promise for cart modification: ', e.toString());
                         }
-                        await promiseQuery[0].adjustAmountLeftInPromise(adjustment, bank.bank_type_id, !!newRemainingAmount && newRemainingAmount < 1);
                     }
                 }
-                await this.save(partial, undefined, shouldSaveToDB, true);
+                await this.save(Object.assign(Object.assign({}, partial), { id: this._data.id }), undefined, shouldSaveToDB, true);
                 // INVENTORY MANAGEMENT
                 const data = this.data();
                 const storeIdToUse = !!data.current_store_id
@@ -1978,7 +1977,7 @@ class Cart extends baseService_1.BaseServiceClass {
                         item: i,
                         qteToUpdate: i.qte,
                         inventoryItem: allInventoryItems.find((inv) => inv.sku == i.sku)
-                    })));
+                    })), space.options.get());
                     if (!!transfersWithItemsToUpdate) {
                         for (let updatesToDo of Object.entries(transfersWithItemsToUpdate)) {
                             const [transferID, specifics] = updatesToDo;
@@ -3302,8 +3301,8 @@ class Cart extends baseService_1.BaseServiceClass {
                 default:
                     return {
                         error: '',
-                        trackingPin: shipPayload.trackingNumbers,
-                        trackingUrl: shipPayload.carrierTrackingUrl
+                        trackingPin: shipPayload.trackingNumbers || shipPayload.tracking,
+                        trackingUrl: shipPayload.carrierTrackingUrl || shipPayload.trackingUrl
                     };
             }
         };
@@ -3328,12 +3327,14 @@ class Cart extends baseService_1.BaseServiceClass {
          * @param escompteItems list of discount products from the dash
          * @param customPriceList list of products with their custom pric from G2
          * @param banksUsedForCart Optionnal. Array of banks_used applied to cart
+         * @param isCartModification Optionnal. Is it a modification process
          */
-        this.updateWithPromiseToPurchasePrices = async (escompteItems, customPriceList = undefined, banksUsedForCart) => {
+        this.updateWithPromiseToPurchasePrices = async (escompteItems, customPriceList = undefined, banksUsedForCart, isCartModification = false) => {
             var _b, _c, _d, _e;
             if (!!!customPriceList || typeof customPriceList == 'string')
                 throw new Error('CustomPriceList is undefined!');
-            if (!!this.data().status &&
+            if (!isCartModification &&
+                !!this.data().status &&
                 this.data().status >= Cart_1.CartStatusEnum.CHECKOUT_PAYMENT_SUCCESS &&
                 !!this.data().paid_at) {
                 console.log('cannot update a paid cart with a PA, returning');
@@ -3397,6 +3398,30 @@ class Cart extends baseService_1.BaseServiceClass {
             this._data = Object.assign(Object.assign({}, this._data), { items: [...updatedPriceProducts, ...associatedEscomptes] });
             await this.calculateTotals();
         };
+        // Remove PA ESC supp, revert to the non PA prices and cancel the PA
+        this.removePromiseToPurchaseFromCart = async (customPriceList = undefined) => {
+            if (!!!customPriceList || typeof customPriceList == 'string' || customPriceList.length === 0)
+                throw new Error('CustomPriceList is undefined!');
+            if (!!!this._data.promise_to_purchase)
+                return;
+            const revertedItems = this._data.items
+                .filter((item) => !(0, g2_1.isEscompteSuppItem)(item.sku))
+                .map((item) => {
+                var _b;
+                if (!!!item.is_temp_prod &&
+                    !!!item.price_override &&
+                    !!!customPriceList.some((p) => p.sku === item.sku)) {
+                    (0, logs_1.SystemLog)({
+                        clientName: 'sdk-admin | Cart | removePromiseToPurchaseFromCart',
+                        clientToken: (_b = process.env.NEXT_PUBLIC_LOG_SYSTEM_KEY) !== null && _b !== void 0 ? _b : ''
+                    }, logs_1.LogType.ERROR, `[PA-REVERT] cart=${this._data.id} item=${item.sku} : SKU absent de la liste régulière — impossible de remettre le prix non-PA`);
+                    throw new Error(`[PA-REVERT] cart=${this._data.id} item=${item.sku} : SKU absent de la liste régulière — impossible de remettre le prix non-PA`);
+                }
+                return (0, g2_1.checkForCustomPriceEquivalent)(item, customPriceList);
+            });
+            this._data = Object.assign(Object.assign({}, this._data), { items: revertedItems, promise_to_purchase: null });
+            await this.calculateTotals();
+        };
         /**
          * Function canBePaidWithMyPromiseToPurchase
          * @description Check if a cart can be paid with a promise to purchase
@@ -3407,7 +3432,7 @@ class Cart extends baseService_1.BaseServiceClass {
          * @param forceCartTypeid Optionnal. A cart type ID to use for bank to apply check, if should be forced
          * @returns true if cart can be paid, false if it cannot
          */
-        this.canBePaidWithMyPromiseToPurchase = async (applicableBanks, applicableBanksHistory, customPriceList = undefined, contingency = 0, forcedBankTypeId) => {
+        this.canBePaidWithMyPromiseToPurchase = async (applicableBanks, applicableBanksHistory, customPriceList = undefined, contingency = 0, forcedBankTypeId, bypassBankAvailability = false) => {
             if (!!!customPriceList || typeof customPriceList == 'string')
                 throw new Error(PromiseToPurchase_2.ApplyBanksToCartErrorsEnum.CUSTOM_PRICE_LIST_UNDEFINED);
             // NEW - used to have a check here if contingency was undefined, but it makes more sense to let the logic pass, even if no contingency exists (could be a volontary decision from user)
@@ -3418,14 +3443,17 @@ class Cart extends baseService_1.BaseServiceClass {
                 const remainingAmounts = await PromiseToPurchase_1.default.calculateRemainingAmounts(this, applicableBanks, applicableBanksHistory, space);
                 // If only one bank is used and said bank has no initial amount, returns empty array
                 // (so there is no overlap between "bank goes over allowed amount" and "bank is disabled in promise")
-                const potentialRemainingAmounts = this.calculatePotentialRemainingAmountsAndSetBanksUsedAmounts(remainingAmounts, applicableBanks, forcedBankTypeId);
+                const potentialRemainingAmounts = this.calculatePotentialRemainingAmountsAndSetBanksUsedAmounts(remainingAmounts, applicableBanks, forcedBankTypeId, bypassBankAvailability);
                 // if bank to use has no initial amount, return false
                 // if payment for any of the banks goes over the remaining amount + the contingency, return false
-                if (!!!potentialRemainingAmounts.length) {
-                    throw new Error(PromiseToPurchase_2.ApplyBanksToCartErrorsEnum.BANK_NOT_FOUND);
-                }
-                if (!!potentialRemainingAmounts.find((bank) => bank.amount + contingency < 0)) {
-                    throw new Error(PromiseToPurchase_2.ApplyBanksToCartErrorsEnum.NOT_ENOUGH_REMAINING);
+                //  If the PA was applied in the creation process, allow applying the PA in modification process even if the bank is inactive
+                if (!bypassBankAvailability) {
+                    if (!!!potentialRemainingAmounts.length) {
+                        throw new Error(PromiseToPurchase_2.ApplyBanksToCartErrorsEnum.BANK_NOT_FOUND);
+                    }
+                    if (!!potentialRemainingAmounts.find((bank) => bank.amount + contingency < 0)) {
+                        throw new Error(PromiseToPurchase_2.ApplyBanksToCartErrorsEnum.NOT_ENOUGH_REMAINING);
+                    }
                 }
                 return true;
             }
@@ -3442,7 +3470,7 @@ class Cart extends baseService_1.BaseServiceClass {
          * @param promiseToPurchase the promise to purchase
          * @returns an array of IBankUsed
          */
-        this.calculatePotentialRemainingAmountsAndSetBanksUsedAmounts = (remainingAmounts, applicableBanks, forcedBankTypeId) => {
+        this.calculatePotentialRemainingAmountsAndSetBanksUsedAmounts = (remainingAmounts, applicableBanks, forcedBankTypeId, bypassBankAvailability = false) => {
             let accountedForItems = new Array();
             let itemsToCheck = this.data().items;
             // allow payment only if the cart contains at least one item that is associated to only one bank
@@ -3484,7 +3512,8 @@ class Cart extends baseService_1.BaseServiceClass {
             // check that not all banks to use are disabled in the promise to purchase
             // if banks to use is disabled make remainingAmounts an empty array :
             // the cart won't use bank because no bank corresponding to the cart is enabled in the promise to purchase
-            if (!!remainingAmounts.length) {
+            //  If the PA was applied in the creation process, allow applying the PA in modification process even if the bank is inactive
+            if (!bypassBankAvailability && !!remainingAmounts.length) {
                 const banksToUse = remainingAmounts;
                 const promiseBanksToUse = banksToUse
                     .map((bankToUse) => {
@@ -3570,7 +3599,7 @@ class Cart extends baseService_1.BaseServiceClass {
                         return priceToPay * item.qte;
                     });
                 }
-                if (amountToRemove > 0 && amount < 1)
+                if (!bypassBankAvailability && amountToRemove > 0 && amount < 1)
                     throw new Error(PromiseToPurchase_2.ApplyBanksToCartErrorsEnum.EMPTY_BANK);
                 if (amountToRemove > 0) {
                     // Update banks used array
@@ -3607,14 +3636,21 @@ class Cart extends baseService_1.BaseServiceClass {
          * @param customPriceList a list of custom price items
          * @param space the space
          * @param forcedCartType Optionnal. If provided, overrides cart type found by check cart item types.
+         * @param isCartModification Optionnal. Pass true when called from the POS order modification flow so escompte lines are rebuilt even on a paid cart.
+         * @param originalPromiseToPurchase Optionnal. The PA the order was originally paid with. In modification, its banks are re-applied even if now disabled.
          * @returns the updated cart and a boolean canBePaid determining if the cart can be paid with the promise or not
          */
-        this.canBePaidWithPA = async (applicableBanks, customerID, customPriceList, space, forcedBankTypeId) => {
+        this.canBePaidWithPA = async (applicableBanks, customerID, customPriceList, space, forcedBankTypeId, isCartModification = false, originalPromiseToPurchase) => {
             const contingency = space.promisesToPurchase.getContingency();
             const escomptesItems = await space.promisesToPurchase.getEscompteItems();
+            // In modification, put the order's original PA banks back and ignore disabled bank
+            const bypassBankAvailability = isCartModification && !!originalPromiseToPurchase && !!originalPromiseToPurchase.banks_used.length;
+            const effectiveApplicableBanks = bypassBankAvailability && !!originalPromiseToPurchase
+                ? await (0, promiseToPurchase_1.getApplicableBanksWithOrderPA)(applicableBanks, originalPromiseToPurchase, space)
+                : applicableBanks;
             // Get use history for applicable banks
             let applicableBanksHistory = [];
-            for (let applicable of applicableBanks) {
+            for (let applicable of effectiveApplicableBanks) {
                 const { promise_id, bank } = applicable;
                 // don't fetch history if no initial_amount
                 if (!!!bank.initial_amount)
@@ -3632,7 +3668,7 @@ class Cart extends baseService_1.BaseServiceClass {
             const filteredApplicableBanksHistory = (0, flatten_1.default)(applicableBanksHistory).filter((b) => !!b);
             // set possible escomptes in cart so correct amounts are used when checking available amounts
             // only set escomptes in cart based on potential applicableBanks where pa is active, bank is active and initial amount is set
-            const possibleBanksToUse = applicableBanks
+            const possibleBanksToUse = effectiveApplicableBanks
                 .filter((b) => !!b.pa_is_active && !!b.bank.active && !!b.bank.initial_amount)
                 .map((b) => ({
                 promise_id: b.promise_id,
@@ -3640,13 +3676,13 @@ class Cart extends baseService_1.BaseServiceClass {
                 bank_type_id: b.bank.bank_type_id,
                 amount: 0
             }));
-            await this.updateWithPromiseToPurchasePrices(escomptesItems, customPriceList, possibleBanksToUse);
-            const canBePaidCheck = await this.canBePaidWithMyPromiseToPurchase(applicableBanks, filteredApplicableBanksHistory, customPriceList, contingency, forcedBankTypeId);
+            await this.updateWithPromiseToPurchasePrices(escomptesItems, customPriceList, possibleBanksToUse, isCartModification);
+            const canBePaidCheck = await this.canBePaidWithMyPromiseToPurchase(effectiveApplicableBanks, filteredApplicableBanksHistory, customPriceList, contingency, forcedBankTypeId, bypassBankAvailability);
             // if banks applicable length is different from banks truly applied to cart,
             // adjust added escomptes with banks used for cart
             if (!!this._data.promise_to_purchase &&
-                applicableBanks.length !== this._data.promise_to_purchase.banks_used.length) {
-                await this.updateWithPromiseToPurchasePrices(escomptesItems, customPriceList, this._data.promise_to_purchase.banks_used);
+                effectiveApplicableBanks.length !== this._data.promise_to_purchase.banks_used.length) {
+                await this.updateWithPromiseToPurchasePrices(escomptesItems, customPriceList, this._data.promise_to_purchase.banks_used, isCartModification);
             }
             const canBePaid = typeof canBePaidCheck === 'boolean';
             return Object.assign(Object.assign({ canBePaid }, (!!!canBePaid ? { canBePaidReason: canBePaidCheck } : {})), { updatedCart: this.data() });