cloudcommerce 0.14.1 → 0.15.0

package/packages/apps/flash-courier/lib-mjs/calculate-flash-courier.mjs

@@ -0,0 +1,246 @@
+import axios from 'axios';
+import logger from 'firebase-functions/logger';
+
+export default async ({ params, application }) => {
+  const appData = {
+    ...application.data,
+    ...application.hidden_data,
+  };
+
+  // setup basic required response object
+
+  const response = {
+    shipping_services: [],
+  };
+
+  if (appData.free_shipping_from_value >= 0) {
+    response.free_shipping_from_value = appData.free_shipping_from_value;
+  }
+  if (!params.to) {
+    // just a free shipping preview with no shipping address received
+    // respond only with free shipping option
+    return response;
+  }
+
+  let flashcourierKey;
+
+  if (process.env.FLASHCOURIER_CONTRACT) {
+    try {
+      const contract = JSON.parse(process.env.FLASHCOURIER_CONTRACT);
+      flashcourierKey = contract.key;
+    } catch (e) {
+      logger.error(e);
+      flashcourierKey = appData.flashcourier_contract && appData.flashcourier_contract.key;
+    }
+  } else {
+    flashcourierKey = appData.flashcourier_contract && appData.flashcourier_contract.key;
+  }
+
+  if (!flashcourierKey) {
+    return {
+      status: 409,
+      error: 'CALCULATE_AUTH_ERR',
+      message: 'Key unset on app hidden data (merchant must configure the app)',
+    };
+  }
+
+  if (appData.free_shipping_from_value >= 0) {
+    response.free_shipping_from_value = appData.free_shipping_from_value;
+  }
+
+  const destinationZip = params.to ? params.to.zip.replace(/\D/g, '') : '';
+  let originZip = '';
+  if (params.from) {
+    originZip = params.from.zip.replace(/\D/g, '');
+  } else if (appData.zip) {
+    originZip = appData.zip.replace(/\D/g, '');
+  }
+
+  if (!originZip) {
+    return {
+      status: 409,
+      error: 'CALCULATE_ERR',
+      message: 'Zip code is unset on app hidden data (merchant must configure the app)',
+    };
+  }
+
+  if (params.items) {
+    // calculate weight and pkg value from items list
+    let finalWeight = 0;
+    params.items.forEach(({ quantity, dimensions, weight }) => {
+      let physicalWeight = 0;
+      let cubicWeight = 1;
+
+      // sum physical weight
+      if (weight && weight.value) {
+        switch (weight.unit) {
+          case 'kg':
+            physicalWeight = weight.value;
+            break;
+          case 'g':
+            physicalWeight = weight.value / 1000;
+            break;
+          case 'mg':
+            physicalWeight = weight.value / 1000000;
+            break;
+          default:
+            break;
+        }
+      }
+
+      // sum total items dimensions to calculate cubic weight
+      if (dimensions) {
+        const sumDimensions = {};
+        Object.keys(dimensions).forEach((side) => {
+          const dimension = dimensions[side];
+          if (dimension && dimension.value) {
+            let dimensionValue;
+            switch (dimension.unit) {
+              case 'cm':
+                dimensionValue = dimension.value;
+                break;
+              case 'm':
+                dimensionValue = dimension.value * 100;
+                break;
+              case 'mm':
+                dimensionValue = dimension.value / 10;
+                break;
+              default:
+                break;
+            }
+            // add/sum current side to final dimensions object
+            if (dimensionValue) {
+              sumDimensions[side] = sumDimensions[side]
+                ? sumDimensions[side] + dimensionValue
+                : dimensionValue;
+            }
+          }
+        });
+
+        // calculate cubic weight
+        // https://suporte.boxloja.pro/article/82-correios-calculo-frete
+        // (C x L x A) / 6.000
+        Object.keys(sumDimensions).forEach((side) => {
+          if (sumDimensions[side]) {
+            cubicWeight *= sumDimensions[side];
+          }
+        });
+        if (cubicWeight > 1) {
+          cubicWeight /= 6000;
+        }
+      }
+      finalWeight += (quantity * (physicalWeight > cubicWeight ? physicalWeight : cubicWeight));
+    });
+
+    // https://www.flashcalculador-sp.com.br/documentacao-api
+    const flashcourierUrl = 'https://www.flashcalculador-sp.com.br/api/v2/calcular_frete'
+      + `?cep_destino=${destinationZip}`
+      + `&peso_gramas=${(finalWeight ? finalWeight * 1000 : 100)}`
+      + `&cliente_chave=${flashcourierKey}`;
+    let flashcourierResult;
+    try {
+      flashcourierResult = (await axios(flashcourierUrl)).data;
+    } catch (err) {
+      let { message } = err;
+      if (err.response && err.response.data && err.response.data.message) {
+        message = err.response.data.message;
+      }
+      // console.warn(`[calc] failed ${flashcourierUrl}`)
+      return {
+        status: 409,
+        error: 'CALCULATE_FAILED_WS',
+        message,
+      };
+    }
+    if (!flashcourierResult || !Array.isArray(flashcourierResult.products)) {
+      return {
+        status: 409,
+        error: 'CALCULATE_FAILED_EMPTY',
+        message: 'Flash Courier API doesnt return valid result',
+      };
+    }
+
+    flashcourierResult.products.forEach((flashcourierProduto) => {
+      Object.keys(flashcourierProduto).forEach((label) => {
+        let price;
+        let days;
+        if (typeof flashcourierProduto[label] === 'object') {
+          price = parseFloat(flashcourierProduto[label].preco);
+          const minDays = parseInt(flashcourierProduto[label].prazo_min, 10);
+          const maxDays = parseInt(flashcourierProduto[label].prazo_max, 10);
+          days = Math.ceil((minDays + maxDays) / 2);
+        } else {
+          price = parseFloat(flashcourierProduto[label]);
+          days = 7;
+        }
+        if (Array.isArray(appData.services) && appData.services.length) {
+          const service = appData.services.find((_service) => label === _service.service_code);
+          if (service) {
+            label = service.label || label;
+          } else {
+            return;
+          }
+        }
+        const shippingLine = {
+          from: {
+            ...params.from,
+            zip: originZip,
+          },
+          to: params.to,
+          price,
+          total_price: price,
+          discount: 0,
+          delivery_time: {
+            days,
+            working_days: true,
+          },
+          posting_deadline: {
+            days: 1,
+            ...appData.posting_deadline,
+          },
+          package: {
+            weight: {
+              value: finalWeight,
+              unit: 'kg',
+            },
+          },
+          flags: ['flashcr-ws'],
+        };
+        if (appData.additional_price) {
+          if (appData.additional_price > 0) {
+            shippingLine.other_additionals = [{
+              tag: 'additional_price',
+              label: 'Adicional padrão',
+              price: appData.additional_price,
+            }];
+          } else {
+            shippingLine.discount -= appData.additional_price;
+          }
+          shippingLine.total_price += appData.additional_price;
+          if (shippingLine.total_price < 0) {
+            shippingLine.total_price = 0;
+          }
+        }
+        response.shipping_services.push({
+          label,
+          shipping_line: shippingLine,
+        });
+      });
+    });
+
+    response.shipping_services.sort((a, b) => {
+      if (a.price > b.price) {
+        return 1;
+      }
+      return -1;
+    });
+  } else {
+    return {
+      status: 400,
+      error: 'CALCULATE_EMPTY_CART',
+      message: 'Cannot calculate shipping without cart items',
+    };
+  }
+
+  return response;
+};

package/packages/apps/flash-courier/lib-mjs/update-tracking.mjs

@@ -0,0 +1,176 @@
+import logger from 'firebase-functions/logger';
+import api from '@cloudcommerce/api';
+import config from '@cloudcommerce/firebase/lib/config';
+import axios from 'axios';
+
+export default () => {
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const { metafields } = config.get();
+    let appData;
+    try {
+      const app = (await api.get(
+        'applications?limit=1&fields=hidden_data,data'
+          + `&app_id=${config.get().apps.flashCourier.appId}`,
+      )).data.result;
+
+      appData = {
+        ...app[0].data,
+        ...app[0].hidden_data,
+      };
+    } catch (err) {
+      logger.error(err);
+      reject(err);
+    }
+
+    if (appData) {
+      let contract;
+      if (process.env.FLASHCOURIER_CONTRACT) {
+        try {
+          contract = JSON.parse(process.env.FLASHCOURIER_CONTRACT);
+        } catch (e) {
+          logger.error(e);
+          contract = appData.flashcourier_contract;
+        }
+      } else {
+        contract = appData.flashcourier_contract;
+      }
+
+      if (contract) {
+        const {
+          login,
+          password,
+          hmac,
+          client_id: clientId,
+          cct_id: cctIds,
+        } = contract;
+
+        if (login && password && hmac && clientId && cctIds) {
+          let flashcourierToken;
+          try {
+            const { data } = await axios({
+              method: 'post',
+              url: 'https://webservice.flashpegasus.com.br/FlashPegasus/rest/api/v1/token',
+              headers: {
+                Authorization: hmac,
+              },
+              data: {
+                login,
+                senha: password,
+              },
+            });
+            flashcourierToken = data.access_token;
+          } catch (err) {
+            logger.error(err);
+          }
+          if (!flashcourierToken) return;
+
+          let orders;
+          const ordersEndpoint = 'orders?fields=_id,number,fulfillment_status'
+            + '&shipping_lines.flags=flashcr-ws'
+            + '&fulfillment_status.current!=delivered'
+            + `&created_at>=${new Date(Date.now() - 1000 * 60 * 60 * 24 * 60).toISOString()}`;
+          try {
+            const { result } = (await api.get(ordersEndpoint)).data;
+            orders = result;
+          } catch (err) {
+            logger.error(err);
+          }
+          if (!orders.length) return;
+          logger.info(`[track] ${orders.map(({ number }) => number).join(' ')}`);
+          try {
+            const { data: { hawbs } } = await axios({
+              method: 'post',
+              url: 'https://webservice.flashpegasus.com.br/FlashPegasus/rest/padrao/v2/consulta',
+              headers: {
+                Authorization: flashcourierToken,
+              },
+              data: {
+                clienteId: Number(clientId),
+                cttId: cctIds.split(',').map((id) => Number(id.trim())),
+                numEncCli: orders.map(({ number }) => {
+                  if (metafields.flashCourierNumberPrefix) {
+                    return `${metafields.flashCourierNumberPrefix}${number}`;
+                  }
+                  return String(number);
+                }),
+              },
+            });
+            const requests = [];
+            for (let i = 0; i < hawbs.length; i++) {
+              const hawb = hawbs[i];
+              const order = orders.find(({ number }) => {
+                return Number(hawb.codigoCartao.replace(/\D/g, '')) === number;
+              });
+              if (!order) {
+                logger.warn(`[track] cannot match order for ${JSON.stringify(hawb)}`);
+              } else {
+                hawb.historico.sort((a, b) => {
+                  if (a.ocorrencia && b.ocorrencia) {
+                    const [aDay, aMonth, aYear, aHour, aMin] = a.ocorrencia.split(/\D/);
+                    const [bDay, bMonth, bYear, bHour, bMin] = b.ocorrencia.split(/\D/);
+                    if (`${aYear}${aMonth}${aDay}${aHour}${aMin}` > `${bYear}${bMonth}${bDay}${bHour}${bMin}`) {
+                      return 1;
+                    }
+                    return -1;
+                  }
+                  return 0;
+                });
+                const { eventoId } = hawb.historico[hawb.historico.length - 1];
+                let status;
+                switch (eventoId) {
+                  case '1100':
+                    status = 'ready_for_shipping';
+                    break;
+                  case '1400':
+                  case '2000':
+                  case '2200':
+                  case '3000':
+                  case '4100':
+                    status = 'shipped';
+                    break;
+                  case '2500':
+                  case '4250':
+                  case '4300':
+                  case '5000':
+                    status = 'delivered';
+                    break;
+                  case '2400':
+                  case '2600':
+                  case '6100':
+                    status = 'returned';
+                    break;
+                  default:
+                }
+                if (
+                  status
+                  && (!order.fulfillment_status || order.fulfillment_status.current !== status)
+                ) {
+                  requests.push(api.post(`orders/${order._id}/fulfillments`, {
+                    status,
+                    flags: ['flashcr'],
+                  }));
+                  if (status === 'shipped') {
+                    const code = hawb.codigoCartao;
+                    requests.push(api.patch(`/orders/${order._id}/shipping_lines/0`, {
+                      tracking_codes: [{
+                        code,
+                        link: `https://www.flashcourier.com.br/rastreio/${code}`,
+                      }],
+                    }));
+                  }
+                }
+              }
+            }
+            if (requests.length) {
+              await Promise.all(requests);
+            }
+            resolve(null);
+          } catch (err) {
+            logger.error(err);
+          }
+        }
+      }
+    }
+  });
+};

package/packages/apps/flash-courier/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "@cloudcommerce/app-flash-courier",
+  "type": "module",
+  "version": "0.15.0",
+  "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./events": "./lib/flash-courier-events.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ecomplus/cloud-commerce.git",
+    "directory": "packages/apps/app-flash-courier"
+  },
+  "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
+  "license": "Apache 2.0 with Commons Clause",
+  "bugs": {
+    "url": "https://github.com/ecomplus/cloud-commerce/issues"
+  },
+  "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/apps/app-flash-courier#readme",
+  "scripts": {
+    "build": "bash ../../../scripts/build-lib.sh"
+  },
+  "dependencies": {
+    "@cloudcommerce/api": "workspace:*",
+    "@cloudcommerce/firebase": "workspace:*",
+    "axios": "^1.4.0",
+    "firebase-functions": "^4.4.1"
+  },
+  "devDependencies": {
+    "@cloudcommerce/types": "workspace:*"
+  }
+}

package/packages/apps/flash-courier/src/flash-courier-events.ts

@@ -0,0 +1,13 @@
+/* eslint-disable import/prefer-default-export */
+import '@cloudcommerce/firebase/lib/init';
+import * as functions from 'firebase-functions/v1';
+import config from '@cloudcommerce/firebase/lib/config';
+import handleTrackingCodes from '../lib-mjs/update-tracking.mjs';
+
+export const flashcourier = {
+  cronTrackingCodes: functions.region(config.get().httpsFunctionOptions.region).pubsub
+    .schedule('19 * * * *')
+    .onRun(() => {
+      return handleTrackingCodes();
+    }),
+};

package/packages/apps/flash-courier/src/flash-courier.ts

@@ -0,0 +1,7 @@
+/* eslint-disable import/prefer-default-export */
+import type { AppModuleBody } from '@cloudcommerce/types';
+import handleCalculateShipping from '../lib-mjs/calculate-flash-courier.mjs';
+
+export const calculateShipping = async (modBody: AppModuleBody) => {
+  return handleCalculateShipping(modBody);
+};

package/packages/apps/flash-courier/src/index.ts

@@ -0,0 +1 @@
+export * from './flash-courier';

package/packages/apps/flash-courier/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  }
+}

package/packages/apps/frenet/lib/functions-lib/database.d.ts

@@ -1,6 +1,7 @@
+import type { ResourceId } from '@cloudcommerce/types';
 declare const db: {
-    save: (orderId: string, trackingStatus: string, trackingCode: string, serviceCode?: string) => Promise<unknown>;
-    get: (orderId: string, trackingCode: string) => Promise<unknown>;
+    save: (orderId: ResourceId, trackingStatus: string, trackingCode: string, serviceCode?: string) => Promise<unknown>;
+    get: (orderId: ResourceId, trackingCode: string) => Promise<unknown>;
     clear: () => Promise<unknown>;
     remove: (trackingCode: string, serviceCode: string) => Promise<unknown>;
     update: (trackingStatus: string, trackingCode: string) => Promise<unknown>;
@@ -9,7 +10,7 @@ declare const db: {
 };
 export default db;
 export type TrackingDoc = {
-    orderId: string;
+    orderId: ResourceId;
     trackingStatus: string;
     trackingCode: string;
     serviceCode: string;

package/packages/apps/frenet/lib/functions-lib/database.js.map

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

package/packages/apps/frenet/lib/functions-lib/update-fulfillments.d.ts

@@ -1,5 +1,6 @@
-declare const updateFulfillments: (orderId: string, trackingCode: string, eventType: number, eventDate: Date) => Promise<true | (Response & {
-    config: import("@cloudcommerce/api/lib/types").Config;
+import type { ResourceId } from '@cloudcommerce/types';
+declare const updateFulfillments: (orderId: ResourceId, trackingCode: string, eventType: number, eventDate: Date) => Promise<true | (Response & {
+    config: import("@cloudcommerce/api/types").Config;
     data: null;
 }) | null>;
 export default updateFulfillments;

package/packages/apps/frenet/lib/functions-lib/update-fulfillments.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-fulfillments.js","sourceRoot":"","sources":["../../src/functions-lib/update-fulfillments.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,oBAAoB,CAAC;AAErC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IACrC,QAAQ,MAAM,EAAE;QACd,KAAK,CAAC,CAAC;QACP,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,UAAU,CAAC;QACpB,KAAK,CAAC;YACJ,OAAO,WAAW,CAAC;QACrB;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAC9B,OAAe,EACf,YAAoB,EACpB,SAAiB,EACjB,SAAe,EACf,EAAE;IACF,IAAI,KAAK,CAAC;IACV,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,gBAAgB,GAAG;QACvB,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;QAClC,MAAM;QACN,iBAAiB,EAAE,MAAM,CAAC,YAAY,CAAC;QACvC,KAAK,EAAE;YACL,YAAY;SACb;KACK,CAAC,CAAC,oCAAoC;IAE9C,IAAI,SAAS,KAAK,CAAC,EAAE;QACnB,KAAK,GAAG,wBAAwB,CAAC;KAClC;SAAM,IAAI,SAAS,KAAK,CAAC,EAAE;QAC1B,KAAK,GAAG,oBAAoB,CAAC;KAC9B;IAED,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,IAAI,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB,CAAC,OAAO,KAAK,MAAM,EAAE;QAC3E,OAAO,IAAI,CAAC;KACb;IACD,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,OAAO,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACnE,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,KAAK,GAAG,GAAG,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;SACpC;QACD,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;KAClD;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"update-fulfillments.js","sourceRoot":"","sources":["../../src/functions-lib/update-fulfillments.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,oBAAoB,CAAC;AAErC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IACrC,QAAQ,MAAM,EAAE;QACd,KAAK,CAAC,CAAC;QACP,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,UAAU,CAAC;QACpB,KAAK,CAAC;YACJ,OAAO,WAAW,CAAC;QACrB;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAC9B,OAAmB,EACnB,YAAoB,EACpB,SAAiB,EACjB,SAAe,EACf,EAAE;IACF,IAAI,KAAK,CAAC;IACV,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,gBAAgB,GAAG;QACvB,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;QAClC,MAAM;QACN,iBAAiB,EAAE,MAAM,CAAC,YAAY,CAAC;QACvC,KAAK,EAAE;YACL,YAAY;SACb;KACK,CAAC,CAAC,oCAAoC;IAE9C,IAAI,SAAS,KAAK,CAAC,EAAE;QACnB,KAAK,GAAG,wBAAwB,CAAC;KAClC;SAAM,IAAI,SAAS,KAAK,CAAC,EAAE;QAC1B,KAAK,GAAG,oBAAoB,CAAC;KAC9B;IAED,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,IAAI,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB,CAAC,OAAO,KAAK,MAAM,EAAE;QAC3E,OAAO,IAAI,CAAC;KACb;IACD,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,OAAO,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACnE,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,KAAK,GAAG,GAAG,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;SACpC;QACD,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;KAClD;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/packages/apps/frenet/lib-mjs/calculate-frenet.mjs

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import logger from 'firebase-functions/logger';
 
 const getDimension = (side, item) => {
   if (item.dimensions && item.dimensions[side]) {
@@ -23,11 +24,17 @@ export default async ({ params, application }) => {
     ...application.hidden_data,
   };
 
-  if (!config.frenet_access_token) {
-    return {
-      error: 'FRENET_ERR',
-      message: 'Frenet token is unset on app hidden data (calculate unavailable) for this store',
-    };
+  if (!process.env.FRENET_TOKEN) {
+    const frenetToken = config.frenet_access_token;
+    if (typeof frenetToken === 'string' && frenetToken) {
+      process.env.FRENET_TOKEN = frenetToken;
+    } else {
+      logger.warn('Missing Frenet token');
+      return {
+        error: 'FRENET_ERR',
+        message: 'Frenet token is unset on app hidden data (calculate unavailable) for this store',
+      };
+    }
   }
 
   // https://apx-mods.e-com.plus/api/v1/calculate_shipping/response_schema.json?store_id=100
@@ -87,7 +94,7 @@ export default async ({ params, application }) => {
       method: 'post',
       headers: {
         'Content-Type': 'application/json',
-        token: config.frenet_access_token,
+        token: process.env.FRENET_TOKEN,
       },
       data: schema,
     });

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {
@@ -26,8 +26,8 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "axios": "^1.4.0",
-    "firebase-admin": "^11.8.0",
-    "firebase-functions": "^4.4.0"
+    "firebase-admin": "^11.9.0",
+    "firebase-functions": "^4.4.1"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",

package/packages/apps/frenet/src/functions-lib/database.ts

@@ -1,10 +1,11 @@
+import type { ResourceId } from '@cloudcommerce/types';
 import { getFirestore } from 'firebase-admin/firestore';
 import logger from 'firebase-functions/logger';
 
 const firestoreColl = 'frenetTrackingCodes';
 
 const save = (
-  orderId: string,
+  orderId: ResourceId,
   trackingStatus: string,
   trackingCode: string,
   serviceCode?: string,
@@ -23,7 +24,7 @@ const save = (
 });
 
 const get = async (
-  orderId: string,
+  orderId: ResourceId,
   trackingCode: string,
 ) => new Promise((resolve, reject) => {
   getFirestore().doc(`${firestoreColl}/${trackingCode}`)
@@ -150,7 +151,7 @@ const db = {
 export default db;
 
 export type TrackingDoc = {
-  orderId: string,
+  orderId: ResourceId,
   trackingStatus: string,
   trackingCode: string,
   serviceCode: string,

package/packages/apps/frenet/src/functions-lib/update-fulfillments.ts

@@ -1,3 +1,4 @@
+import type { ResourceId } from '@cloudcommerce/types';
 import api from '@cloudcommerce/api';
 
 const parseStatus = (status: number) => {
@@ -17,7 +18,7 @@ const parseStatus = (status: number) => {
 };
 
 const updateFulfillments = async (
-  orderId: string,
+  orderId: ResourceId,
   trackingCode: string,
   eventType: number,
   eventDate: Date,

package/packages/apps/galaxpay/lib/functions-lib/all-parses.js

@@ -1,5 +1,5 @@
 // import type { GalaxpayApp } from '../../types/configApp.js';
-// import type { ListPaymentsResponse } from '@cloudcommerce/types/modules/list_payments:response';
+// import type { ListPaymentsResponse } from '@cloudcommerce/types';
 // type Gateway = ListPaymentsResponse['payment_gateways'][number]
 const gerateId = (id) => {
   const length = 24 - id.toString().length + 1;