addio-admin-sdk 1.7.185 → 1.7.186-canary-1

package/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(yarn test *)"
+    ]
+  }
+}

package/.env

@@ -2,14 +2,13 @@ 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_PROD='1:725873016982:web:9b1f6d77819909e19102b7'
 NEXT_PUBLIC_FIREBASE_APP_ID_DEV='1:188490998694:web:eecd719e7b18f38d272567'
+NEXT_PUBLIC_FIREBASE_APP_ID_PROD='1:725873016982:web:9b1f6d77819909e19102b7'
 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
+NEXT_PUBLIC_SERVICE_DATABASE_WRITE_PROVIDER=nobase,firebase
 NEXT_PUBLIC_SERVICE_DATABASE_URL=https://db-test.addiocommerce.com/
-NEXT_PUBLIC_API_URL=https://api-test.addiocommerce.com/v1
-NEXT_PUBLIC_SERVICE_DATABASE_TOKEN='337043a374-6f0be-5eb26-05be550631'
-LOCAL_FIRESTORE=false
+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

package/changelog.md

@@ -1,3 +1,12 @@
+## [25-06-2026]
+
+### Délai minimum des commandes d'installation (Groupe Richer)
+
+- **Added**
+- **Changed**
+  - Dans `getMinDateOffset` (`rules/GR/utils/expedition.ts`), nouvelle logique de première plage horaire disponible pour les commandes d'installation : Jeudi et Vendredi → Lundi, les autres jours → +2 jours. L'ancienne logique « Medium staff » (Jeudi → Samedi) est conservée en commentaire daté pour pouvoir y revenir.
+- **Fixed**
+
 ## [03-06-2026]
 
 ### Ajustement à la logique qui génère l'item de "type de panier" pour le bon de commande G2

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

@@ -274,8 +274,9 @@ 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>;
     /**
      * Function canBePaidWithMyPromiseToPurchase
      * @description Check if a cart can be paid with a promise to purchase
@@ -306,9 +307,10 @@ 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.
      * @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) => 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");
@@ -1906,46 +1905,15 @@ 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 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);
-                        }
-                        await promiseQuery[0].adjustAmountLeftInPromise(adjustment, bank.bank_type_id, !!newRemainingAmount && newRemainingAmount < 1);
+                await this.save(partial, undefined, shouldSaveToDB, true);
+                if (shouldSaveToDB && !!this._data.promise_to_purchase) {
+                    try {
+                        await this.checkForEmptyBanksAfterPayment(space);
+                    }
+                    catch (e) {
+                        console.log('error on checking for empty banks after modification: ', e.toString());
                     }
                 }
-                await this.save(partial, undefined, shouldSaveToDB, true);
                 // INVENTORY MANAGEMENT
                 const data = this.data();
                 const storeIdToUse = !!data.current_store_id
@@ -3328,12 +3296,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');
@@ -3607,9 +3577,10 @@ 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.
          * @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) => {
             const contingency = space.promisesToPurchase.getContingency();
             const escomptesItems = await space.promisesToPurchase.getEscompteItems();
             // Get use history for applicable banks
@@ -3640,13 +3611,13 @@ class Cart extends baseService_1.BaseServiceClass {
                 bank_type_id: b.bank.bank_type_id,
                 amount: 0
             }));
-            await this.updateWithPromiseToPurchasePrices(escomptesItems, customPriceList, possibleBanksToUse);
+            await this.updateWithPromiseToPurchasePrices(escomptesItems, customPriceList, possibleBanksToUse, isCartModification);
             const canBePaidCheck = await this.canBePaidWithMyPromiseToPurchase(applicableBanks, filteredApplicableBanksHistory, customPriceList, contingency, forcedBankTypeId);
             // 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);
+                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() });