cloudcommerce 0.8.7 → 0.9.0

package/packages/api/lib/api.d.ts

@@ -1,4 +1,4 @@
-import type { ResourceOpQuery, Endpoint, Config, ResponseBody, RequestBody, ErrorBody } from './types';
+import type { Endpoint, Config, ResponseBody, RequestBody, ErrorBody } from './types';
 declare global {
     var __apiCache: Record<string, {
         timestamp: number;
@@ -37,15 +37,20 @@ declare const api: {
     }>;
     get: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, config?: C | undefined) => Promise<Response & {
         config: Config;
-        data: E extends `${string}/${string}/${string}` ? any : E extends `products/${string}` ? import("./types").Products : E extends `categories/${string}` ? import("./types").Categories : E extends `brands/${string}` ? import("./types").Brands : E extends `collections/${string}` ? import("./types").Collections : E extends `grids/${string}` ? import("./types").Grids : E extends `carts/${string}` ? import("./types").Carts : E extends `orders/${string}` ? import("./types").Orders : E extends `customers/${string}` ? import("./types").Customers : E extends `stores/${string}` ? import("./types").Stores : E extends `applications/${string}` ? import("./types").Applications : E extends `authentications/${string}` ? import("./types").Authentications : E extends ResourceOpQuery ? import("./types").ResourceListResult<E> : E extends "events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me" ? import("./types").EventsResult<E> : any;
+        data: ResponseBody<{
+            endpoint: E;
+        }>;
     }>;
-    post: <E_1 extends Endpoint, C_1 extends AbstractedConfig>(endpoint: E_1, body: E_1 extends "products" | `products/${string}` ? import("./types").ProductSet : E_1 extends "categories" | `categories/${string}` ? import("./types").CategorySet : E_1 extends "brands" | `brands/${string}` ? import("./types").BrandSet : E_1 extends "collections" | `collections/${string}` ? import("./types").CollectionSet : E_1 extends "grids" | `grids/${string}` ? import("./types").GridSet : E_1 extends "carts" | `carts/${string}` ? import("./types").CartSet : E_1 extends "orders" | `orders/${string}` ? import("./types").OrderSet : E_1 extends "customers" | `customers/${string}` ? import("./types").CustomerSet : E_1 extends "stores" | `stores/${string}` ? import("./types").StoreSet : E_1 extends "applications" | `applications/${string}` ? import("./types").ApplicationSet : E_1 extends "authentications" | `authentications/${string}` ? import("./types").AuthenticationSet : any, config?: (E_1 extends "login" | "authenticate" ? AbstractedConfig : C_1) | undefined) => Promise<Response & {
+    post: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
+        endpoint: E;
+        method: 'post';
+    }>, config?: (E extends "login" | "authenticate" ? AbstractedConfig : C) | undefined) => Promise<Response & {
         config: Config;
-        data: E_1 extends "login" ? {
+        data: E extends "login" ? {
             _id: import("./types").ResourceId;
             store_ids: number[];
             api_key: string;
-        } : E_1 extends "authenticate" ? {
+        } : E extends "authenticate" ? {
             my_id: string;
             access_token: string;
             expires: string;
@@ -53,7 +58,10 @@ declare const api: {
             _id: import("./types").ResourceId;
         };
     }>;
-    put: <E_2 extends `products/${string}` | `categories/${string}` | `brands/${string}` | `collections/${string}` | `grids/${string}` | `carts/${string}` | `orders/${string}` | `customers/${string}` | `stores/${string}` | `applications/${string}` | `authentications/${string}` | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me") | `products/${string}/${string}` | `categories/${string}/${string}` | `brands/${string}/${string}` | `collections/${string}/${string}` | `grids/${string}/${string}` | `carts/${string}/${string}` | `orders/${string}/${string}` | `customers/${string}/${string}` | `stores/${string}/${string}` | `applications/${string}/${string}` | `authentications/${string}/${string}` | `slugs/${string}` | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications" | "search/v1" | "login" | "authenticate" | "ask-auth-callback" | "check-username", C_2 extends AbstractedConfig>(endpoint: E_2, body: E_2 extends "products" | `products/${string}` ? import("./types").ProductSet : E_2 extends "categories" | `categories/${string}` ? import("./types").CategorySet : E_2 extends "brands" | `brands/${string}` ? import("./types").BrandSet : E_2 extends "collections" | `collections/${string}` ? import("./types").CollectionSet : E_2 extends "grids" | `grids/${string}` ? import("./types").GridSet : E_2 extends "carts" | `carts/${string}` ? import("./types").CartSet : E_2 extends "orders" | `orders/${string}` ? import("./types").OrderSet : E_2 extends "customers" | `customers/${string}` ? import("./types").CustomerSet : E_2 extends "stores" | `stores/${string}` ? import("./types").StoreSet : E_2 extends "applications" | `applications/${string}` ? import("./types").ApplicationSet : E_2 extends "authentications" | `authentications/${string}` ? import("./types").AuthenticationSet : any, config?: C_2 | undefined) => Promise<Response & {
+    put: <E_1 extends `products/${string}` | `categories/${string}` | `brands/${string}` | `collections/${string}` | `grids/${string}` | `carts/${string}` | `orders/${string}` | `customers/${string}` | `stores/${string}` | `applications/${string}` | `authentications/${string}` | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me") | `products/${string}/${string}` | `categories/${string}/${string}` | `brands/${string}/${string}` | `collections/${string}/${string}` | `grids/${string}/${string}` | `carts/${string}/${string}` | `orders/${string}/${string}` | `customers/${string}/${string}` | `stores/${string}/${string}` | `applications/${string}/${string}` | `authentications/${string}/${string}` | `slugs/${string}` | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications" | "search/v1" | "login" | "authenticate" | "ask-auth-callback" | "check-username", C_1 extends AbstractedConfig>(endpoint: E_1, body: RequestBody<{
+        endpoint: E_1;
+        method: 'put';
+    }>, config?: C_1 | undefined) => Promise<Response & {
         config: Config;
         data: null;
     }>;
@@ -73,15 +81,20 @@ declare const api: {
 type AbstractedConfig = Omit<Config, 'endpoint' | 'method'>;
 declare const get: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, config?: C | undefined) => Promise<Response & {
     config: Config;
-    data: E extends `${string}/${string}/${string}` ? any : E extends `products/${string}` ? import("./types").Products : E extends `categories/${string}` ? import("./types").Categories : E extends `brands/${string}` ? import("./types").Brands : E extends `collections/${string}` ? import("./types").Collections : E extends `grids/${string}` ? import("./types").Grids : E extends `carts/${string}` ? import("./types").Carts : E extends `orders/${string}` ? import("./types").Orders : E extends `customers/${string}` ? import("./types").Customers : E extends `stores/${string}` ? import("./types").Stores : E extends `applications/${string}` ? import("./types").Applications : E extends `authentications/${string}` ? import("./types").Authentications : E extends ResourceOpQuery ? import("./types").ResourceListResult<E> : E extends "events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me" ? import("./types").EventsResult<E> : any;
+    data: ResponseBody<{
+        endpoint: E;
+    }>;
 }>;
-declare const post: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, body: E extends "products" | `products/${string}` ? import("./types").ProductSet : E extends "categories" | `categories/${string}` ? import("./types").CategorySet : E extends "brands" | `brands/${string}` ? import("./types").BrandSet : E extends "collections" | `collections/${string}` ? import("./types").CollectionSet : E extends "grids" | `grids/${string}` ? import("./types").GridSet : E extends "carts" | `carts/${string}` ? import("./types").CartSet : E extends "orders" | `orders/${string}` ? import("./types").OrderSet : E extends "customers" | `customers/${string}` ? import("./types").CustomerSet : E extends "stores" | `stores/${string}` ? import("./types").StoreSet : E extends "applications" | `applications/${string}` ? import("./types").ApplicationSet : E extends "authentications" | `authentications/${string}` ? import("./types").AuthenticationSet : any, config?: (E extends "login" | "authenticate" ? AbstractedConfig : C) | undefined) => Promise<Response & {
+declare const post: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
+    endpoint: E;
+    method: 'post';
+}>, config?: (E extends "login" | "authenticate" ? AbstractedConfig : C) | undefined) => Promise<Response & {
     config: Config;
-    data: E_1 extends "login" ? {
+    data: E extends "login" ? {
         _id: import("./types").ResourceId;
         store_ids: number[];
         api_key: string;
-    } : E_1 extends "authenticate" ? {
+    } : E extends "authenticate" ? {
         my_id: string;
         access_token: string;
         expires: string;
@@ -89,7 +102,10 @@ declare const post: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E
         _id: import("./types").ResourceId;
     };
 }>;
-declare const put: <E extends `products/${string}` | `categories/${string}` | `brands/${string}` | `collections/${string}` | `grids/${string}` | `carts/${string}` | `orders/${string}` | `customers/${string}` | `stores/${string}` | `applications/${string}` | `authentications/${string}` | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me") | `products/${string}/${string}` | `categories/${string}/${string}` | `brands/${string}/${string}` | `collections/${string}/${string}` | `grids/${string}/${string}` | `carts/${string}/${string}` | `orders/${string}/${string}` | `customers/${string}/${string}` | `stores/${string}/${string}` | `applications/${string}/${string}` | `authentications/${string}/${string}` | `slugs/${string}` | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications" | "search/v1" | "login" | "authenticate" | "ask-auth-callback" | "check-username", C extends AbstractedConfig>(endpoint: E, body: E extends "products" | `products/${string}` ? import("./types").ProductSet : E extends "categories" | `categories/${string}` ? import("./types").CategorySet : E extends "brands" | `brands/${string}` ? import("./types").BrandSet : E extends "collections" | `collections/${string}` ? import("./types").CollectionSet : E extends "grids" | `grids/${string}` ? import("./types").GridSet : E extends "carts" | `carts/${string}` ? import("./types").CartSet : E extends "orders" | `orders/${string}` ? import("./types").OrderSet : E extends "customers" | `customers/${string}` ? import("./types").CustomerSet : E extends "stores" | `stores/${string}` ? import("./types").StoreSet : E extends "applications" | `applications/${string}` ? import("./types").ApplicationSet : E extends "authentications" | `authentications/${string}` ? import("./types").AuthenticationSet : any, config?: C | undefined) => Promise<Response & {
+declare const put: <E extends `products/${string}` | `categories/${string}` | `brands/${string}` | `collections/${string}` | `grids/${string}` | `carts/${string}` | `orders/${string}` | `customers/${string}` | `stores/${string}` | `applications/${string}` | `authentications/${string}` | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${string}` | `events/categories/${string}` | `events/brands/${string}` | `events/collections/${string}` | `events/grids/${string}` | `events/carts/${string}` | `events/orders/${string}` | `events/customers/${string}` | `events/stores/${string}` | `events/applications/${string}` | `events/authentications/${string}` | "events/me") | `products/${string}/${string}` | `categories/${string}/${string}` | `brands/${string}/${string}` | `collections/${string}/${string}` | `grids/${string}/${string}` | `carts/${string}/${string}` | `orders/${string}/${string}` | `customers/${string}/${string}` | `stores/${string}/${string}` | `applications/${string}/${string}` | `authentications/${string}/${string}` | `slugs/${string}` | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications" | "search/v1" | "login" | "authenticate" | "ask-auth-callback" | "check-username", C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
+    endpoint: E;
+    method: 'put';
+}>, config?: C | undefined) => Promise<Response & {
     config: Config;
     data: null;
 }>;

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/api.js",
   "types": "lib/api.d.ts",

package/packages/apps/correios/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-correios",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/correios.js",
   "repository": {
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "axios": "^1.3.4",
-    "xml2js": "^0.4.23"
+    "axios": "^1.3.5",
+    "xml2js": "^0.5.0"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*"

package/packages/apps/custom-payment/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app for simple custom payment methods",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/custom-shipping/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-shipping",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app for custom shipping methods",
   "main": "lib/custom-shipping.js",
   "repository": {

package/packages/apps/datafrete/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-datafrete",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {
@@ -26,8 +26,8 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.3",
-    "axios": "^1.3.4",
-    "firebase-admin": "^11.5.0",
+    "axios": "^1.3.5",
+    "firebase-admin": "^11.6.0",
     "firebase-functions": "^4.2.1"
   },
   "devDependencies": {

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

package/packages/apps/emails/lib/functios-lib/abandoned-carts.js

@@ -3,13 +3,14 @@ import api from '@cloudcommerce/api';
 import transactionalMails from '@ecomplus/transactional-mails';
 import { getFirestore } from 'firebase-admin/firestore';
 import email from '@cloudcommerce/emails';
+import config from '@cloudcommerce/firebase/lib/config';
 import triggerActions from './trigger-actions.js';
 import { getStore } from './utils.js';
 
 export default async () => {
   try {
     // logger.log('# Check abandoned carts');
-    const [application] = (await api.get('applications?app_id=1243&fields=hidden_data,data')).data.result;
+    const [application] = (await api.get(`applications?app_id=${config.get().apps.emails.appId}&fields=hidden_data,data`)).data.result;
     const store = getStore();
     const appData = {
       ...application.data,

package/packages/apps/emails/lib/functios-lib/abandoned-carts.js.map

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

package/packages/apps/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-emails",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce default transactional email app",
   "main": "lib/index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "@cloudcommerce/emails": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/transactional-mails": "^2.0.0",
-    "firebase-admin": "^11.5.0",
+    "firebase-admin": "^11.6.0",
     "firebase-functions": "^3.24.1"
   },
   "devDependencies": {

package/packages/apps/emails/src/functios-lib/abandoned-carts.ts

@@ -3,6 +3,7 @@ import api from '@cloudcommerce/api';
 import transactionalMails from '@ecomplus/transactional-mails';
 import { getFirestore } from 'firebase-admin/firestore';
 import email from '@cloudcommerce/emails';
+import config from '@cloudcommerce/firebase/lib/config';
 import triggerActions from './trigger-actions';
 import { getStore } from './utils';
 
@@ -10,7 +11,7 @@ export default async () => {
   try {
     // logger.log('# Check abandoned carts');
     const [application] = (await api.get(
-      'applications?app_id=1243&fields=hidden_data,data',
+      `applications?app_id=${config.get().apps.emails.appId}&fields=hidden_data,data`,
     )).data.result;
 
     const store = getStore();

package/packages/apps/fb-conversions/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders to Facebook Conversions API",
   "main": "lib/index.js",
   "repository": {
@@ -22,7 +22,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "facebook-nodejs-business-sdk": "^15.0.2",
-    "firebase-admin": "^11.5.0",
+    "firebase-admin": "^11.6.0",
     "firebase-functions": "^4.2.1"
   },
   "devDependencies": {

package/packages/apps/frenet/lib/functions-lib/tracking-codes.js

@@ -1,5 +1,6 @@
 import api from '@cloudcommerce/api';
 import logger from 'firebase-functions/logger';
+import config from '@cloudcommerce/firebase/lib/config';
 import db from './database.js';
 import updateOrderfulfilllment from './update-fulfillments.js';
 import fetchTrackingEvents from './fetch-tracking-code.js';
@@ -7,7 +8,7 @@ import removeDeliveredToFirestore from './remove-delivered.js';
 
 const getConfig = async () => {
   try {
-    const app = (await api.get('applications?app_id=1244&fields=hidden_data')).data.result;
+    const app = (await api.get(`applications?app_id=${config.get().apps.frenet.appId}&fields=hidden_data`)).data.result;
     return app[0].hidden_data;
   } catch (err) {
     logger.error('(App Frenet) Error =>', err);

package/packages/apps/frenet/lib/functions-lib/tracking-codes.js.map

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

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {
@@ -25,8 +25,8 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.3.4",
-    "firebase-admin": "^11.5.0",
+    "axios": "^1.3.5",
+    "firebase-admin": "^11.6.0",
     "firebase-functions": "^4.2.1"
   },
   "devDependencies": {

package/packages/apps/frenet/src/functions-lib/tracking-codes.ts

@@ -1,6 +1,7 @@
 import type { TrackingDoc } from './database';
 import api from '@cloudcommerce/api';
 import logger from 'firebase-functions/logger';
+import config from '@cloudcommerce/firebase/lib/config';
 import db from './database';
 import updateOrderfulfilllment from './update-fulfillments';
 import fetchTrackingEvents from './fetch-tracking-code';
@@ -9,7 +10,7 @@ import removeDeliveredToFirestore from './remove-delivered';
 const getConfig = async () => {
   try {
     const app = (await api.get(
-      'applications?app_id=1244&fields=hidden_data',
+      `applications?app_id=${config.get().apps.frenet.appId}&fields=hidden_data`,
     )).data.result;
 
     return app[0].hidden_data;

package/packages/apps/galaxpay/lib/functions-lib/ecom/events-to-galaxpay.js

@@ -3,7 +3,7 @@ import { getFirestore } from 'firebase-admin/firestore';
 import config from '@cloudcommerce/firebase/lib/config';
 import GalaxpayAxios from '../galaxpay/auth/create-access.js';
 
-const collectionSubscription = getFirestore().collection('subscriptions');
+const collectionSubscription = getFirestore().collection('galaxpaySubscriptions');
 const handleApiEvent = async ({
   evName, apiEvent, apiDoc, app,
 }) => {

package/packages/apps/galaxpay/lib/functions-lib/ecom/events-to-galaxpay.js.map

@@ -1 +1 @@
-{"version":3,"file":"events-to-galaxpay.js","sourceRoot":"","sources":["../../../src/functions-lib/ecom/events-to-galaxpay.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAE3D,MAAM,sBAAsB,GAAG,YAAY,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AAE1E,MAAM,cAAc,GAAoB,KAAK,EAAE,EAC7C,MAAM,EACN,QAAQ,EACR,MAAM,EACN,GAAG,GACJ,EAAE,EAAE;IACH,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,UAAU,EAAE,CAAC;IACtC,MAAM,OAAO,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACpD,IACE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;WACjC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,EACzC;QACA,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;KACb;IACD,MAAM,CAAC,IAAI,CAAC,aAAa,UAAU,KAAK,MAAM,QAAQ,MAAM,EAAE,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;QACtC,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,YAAY,EAAE,OAAO,CAAC,aAAa;KACpC,CAAC,CAAC;IAEH,MAAM,aAAa,CAAC,SAAS,CAAC;IAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC;IAChC,IAAI,KAAK,EAAE;QACT,IAAI,MAAM,KAAK,kBAAkB,EAAE;YACjC,MAAM,KAAK,GAAG,MAAgB,CAAC;YAE/B,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE;gBAC7B,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC3E,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,EAAE;oBAC/C,MAAM,eAAe,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBAChD,IAAI,eAAe,EAAE;wBACnB,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;wBAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;4BAC1B,IAAI;gCACF,MAAM,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC;gCACvD,MAAM,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;qCACxC,GAAG,CAAC;oCACH,MAAM,EAAE,WAAW;oCACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iCACpC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qCAClB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;6BACxB;4BAAC,OAAO,GAAQ,EAAE;gCACjB,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;gCACxC,IAAI,UAAU,KAAK,GAAG,EAAE;oCACtB,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;oCACpE,OAAO,IAAI,CAAC;iCACb;gCACD,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,GAAG,EAAE;oCAC5C,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;oCAC5E,OAAO,IAAI,CAAC;iCACb;gCACD,MAAM,GAAG,CAAC;6BACX;yBACF;qBACF;oBACD,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;iBACtE;aACF;YACD,OAAO,IAAI,CAAC;SACb;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC;QAC5D,MAAM,UAAU,GAAG,WAAW,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,qCAAqC,CAAC;QAE5G,OAAO,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE;YAC5B,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,CAAC,6BAA6B,EAAE,0BAA0B,CAAC;SACpE,CAAC,CAAC;KACJ;IACD,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IACjD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"events-to-galaxpay.js","sourceRoot":"","sources":["../../../src/functions-lib/ecom/events-to-galaxpay.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAE3D,MAAM,sBAAsB,GAAG,YAAY,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;AAElF,MAAM,cAAc,GAAoB,KAAK,EAAE,EAC7C,MAAM,EACN,QAAQ,EACR,MAAM,EACN,GAAG,GACJ,EAAE,EAAE;IACH,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,UAAU,EAAE,CAAC;IACtC,MAAM,OAAO,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACpD,IACE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;WACjC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,EACzC;QACA,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;KACb;IACD,MAAM,CAAC,IAAI,CAAC,aAAa,UAAU,KAAK,MAAM,QAAQ,MAAM,EAAE,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;QACtC,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,YAAY,EAAE,OAAO,CAAC,aAAa;KACpC,CAAC,CAAC;IAEH,MAAM,aAAa,CAAC,SAAS,CAAC;IAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC;IAChC,IAAI,KAAK,EAAE;QACT,IAAI,MAAM,KAAK,kBAAkB,EAAE;YACjC,MAAM,KAAK,GAAG,MAAgB,CAAC;YAE/B,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE;gBAC7B,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC3E,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,EAAE;oBAC/C,MAAM,eAAe,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBAChD,IAAI,eAAe,EAAE;wBACnB,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;wBAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;4BAC1B,IAAI;gCACF,MAAM,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC;gCACvD,MAAM,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;qCACxC,GAAG,CAAC;oCACH,MAAM,EAAE,WAAW;oCACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iCACpC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qCAClB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;6BACxB;4BAAC,OAAO,GAAQ,EAAE;gCACjB,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;gCACxC,IAAI,UAAU,KAAK,GAAG,EAAE;oCACtB,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;oCACpE,OAAO,IAAI,CAAC;iCACb;gCACD,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,GAAG,EAAE;oCAC5C,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;oCAC5E,OAAO,IAAI,CAAC;iCACb;gCACD,MAAM,GAAG,CAAC;6BACX;yBACF;qBACF;oBACD,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;iBACtE;aACF;YACD,OAAO,IAAI,CAAC;SACb;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC;QAC5D,MAAM,UAAU,GAAG,WAAW,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,qCAAqC,CAAC;QAE5G,OAAO,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE;YAC5B,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,CAAC,6BAA6B,EAAE,0BAA0B,CAAC;SACpE,CAAC,CAAC;KACJ;IACD,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IACjD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/packages/apps/galaxpay/lib/functions-lib/galaxpay/webhook.js

@@ -3,6 +3,7 @@ import { getFirestore } from 'firebase-admin/firestore';
 import logger from 'firebase-functions/logger';
 import config from '@cloudcommerce/firebase/lib/config';
 import { parseStatus, parsePeriodicityToEcom, gerateId } from '../all-parses.js';
+import GalaxpayAxios from './auth/create-access.js';
 import { updateValueSubscription, checkAmountItemsOrder } from './update-subscription.js';
 
 const collectionSubscription = getFirestore().collection('galaxpaySubscriptions');
@@ -17,20 +18,16 @@ const getApp = async () => {
       });
   });
 };
-const checkStatus = (financialStatus, GalaxPayTransaction) => {
-  if (financialStatus.current === parseStatus(GalaxPayTransaction.status)) {
-    return true;
-  }
-  if ((financialStatus.current === 'paid' || financialStatus.current === 'authorized')
-        && parseStatus(GalaxPayTransaction.status) !== 'refunded') {
+const checkStatusIsEqual = (financialStatus, galaxPayTransactionStatus) => {
+  if (financialStatus.current === parseStatus(galaxPayTransactionStatus)) {
     return true;
   }
   return false;
 };
-const checkStatusNotValid = (status) => {
+const checkStatusPaid = (status) => {
   const parsedStatus = parseStatus(status);
-  // logger.log('>> Status (', status, ')=> ', parsedStatus);
-  if (parsedStatus === 'unauthorized' || parsedStatus === 'refunded' || parsedStatus === 'voided') {
+  logger.log(`>> Status is ${status} => ${parsedStatus}`);
+  if (parsedStatus === 'paid') {
     return true;
   }
   return false;
@@ -55,9 +52,10 @@ const findOrderByTransactionId = (transactionId) => {
   });
 };
 const findOrderById = async (orderId) => new Promise((resolve) => {
-  api.get(`orders/${orderId}?fields=transactions,financial_status`).then(({ data: order }) => {
-    resolve(order);
-  });
+  api.get(`orders/${orderId}`)
+    .then(({ data: order }) => {
+      resolve(order);
+    });
 });
 const createTransaction = async (res, subscriptionLabel, plan, orderNumber, galaxpayFristTransactionId, GalaxPayTransaction, GalaxPaySubscription, GalaxPayTransactionValue, originalOrderId) => {
   if (galaxpayFristTransactionId !== GalaxPayTransaction.galaxPayId) {
@@ -153,9 +151,6 @@ const handleWehook = async (req, res) => {
   const GalaxPayTransactionValue = GalaxPayTransaction.value / 100;
   logger.log(`> (App GalaxPay) WebHook ${type}, Body ${JSON.stringify(galaxpayHook)}, quantity:
     ${GalaxPaySubscriptionQuantity}, status: ${GalaxPayTransaction.status} <`);
-  // if (galaxpayHook.confirmHash) {
-  //   logger.log('> ', galaxpayHook.confirmHash);
-  // }
   try {
     if (type === 'transaction.updateStatus') {
       const documentSnapshot = await collectionSubscription.doc(originalOrderId).get();
@@ -165,30 +160,69 @@ const handleWehook = async (req, res) => {
           const {
             galaxpayFristTransactionId, plan, orderNumber, subscriptionLabel,
           } = docSubscription.data();
+          let galaxPayTransactionStatus;
+          let galaxpaySubscriptionStatus;
+          let transactionCreatedAt;
+          const app = await getApp();
+          try {
+            // check subscription and transaction status before in galaxpay
+            const galaxpayAxios = new GalaxpayAxios({
+              galaxpayId: app.hidden_data?.galaxpay_id,
+              galaxpayHash: app.hidden_data?.galaxpay_hash,
+            });
+            await galaxpayAxios.preparing;
+            if (galaxpayAxios.axios) {
+              let { data } = await galaxpayAxios.axios
+                .get(`/transactions?galaxPayIds=${GalaxPayTransaction.galaxPayId}&startAt=0&limit=1`);
+              galaxPayTransactionStatus = data.Transactions[0]?.status;
+              const dateTimeTransaction = data.Transactions[0]?.createdAt;
+              transactionCreatedAt = dateTimeTransaction && new Date(`${dateTimeTransaction} UTC-3`);
+              logger.log(`>> Transaction status: ${galaxPayTransactionStatus}`);
+              data = (await galaxpayAxios.axios
+                .get(`/subscriptions?myIds=${originalOrderId}&startAt=0&limit=1`)).data;
+              galaxpaySubscriptionStatus = data.Subscriptions[0]?.status;
+              logger.log(`>> Subscription status: ${galaxpaySubscriptionStatus}`);
+            }
+          } catch (err) {
+            logger.warn(`galaxpay webhook Error: get Transaction/Subscription in Galaxpay => ${err?.message}`);
+          }
           if (galaxpayFristTransactionId === GalaxPayTransaction.galaxPayId) {
             // update frist payment
             const order = await findOrderById(originalOrderId);
             // Update value Subscription in GalaxPay
             //   logger.log('plan-> ', JSON.stringify(plan));
-            // not update subscripton canceled
-            if (!checkStatusNotValid(GalaxPayTransaction.status) && order.items) {
-              const app = await getApp();
-              await updateValueSubscription(app, originalOrderId, order.amount, order.items, plan);
+            // subscripton is paid
+            if (checkStatusPaid(galaxPayTransactionStatus) && order.items) {
+              const oldSubscriptionValue = docSubscription.data()?.value
+                                || ({ ...order.amount }.total * 100);
+              const newValue = checkAmountItemsOrder({ ...order.amount }, [...order.items], { ...plan });
+              if (newValue && newValue !== oldSubscriptionValue) {
+                await updateValueSubscription(app, originalOrderId, order.amount, order.items, plan);
+                collectionSubscription.doc(originalOrderId)
+                  .set({
+                    updatedAt: new Date().toISOString(),
+                    value: newValue,
+                  }, { merge: true })
+                  .catch(logger.error);
+              }
             }
             //   logger.log('ORDER: ', JSON.stringify(order.amount), ' **');
             // logger.log('> order ', order)
             if (order.financial_status
-                            && checkStatus(order.financial_status, GalaxPayTransaction)) {
+                            && checkStatusIsEqual(order.financial_status, galaxPayTransactionStatus)) {
+              // check status is equal
               return res.sendStatus(200);
             }
             if (order.transactions) {
               // update payment
               const transactionId = order.transactions[0]._id;
+              let notificationCode = `;${GalaxPayTransaction.tid || ''};`;
+              notificationCode += `${GalaxPayTransaction.authorizationCode || ''}`;
               const bodyPaymentHistory = {
-                date_time: new Date().toISOString(),
-                status: parseStatus(GalaxPayTransaction.status),
+                date_time: transactionCreatedAt || new Date().toISOString(),
+                status: parseStatus(galaxPayTransactionStatus),
                 transaction_id: transactionId,
-                notification_code: `${type};${galaxpayHook.webhookId}`,
+                notification_code: `${type};${galaxpayHook.webhookId}${notificationCode}`,
                 flags: ['GalaxPay'],
               }; // TODO: incompatible type=> amount and status;;
               await api.post(`orders/${order._id}/payments_history`, bodyPaymentHistory);
@@ -202,36 +236,66 @@ const handleWehook = async (req, res) => {
             }
           } else {
             /*
-                          add order, because recurrence creates all transactions in the
-                          first transaction when quantity is non-zero,search for the order by ID,
-                          if not found, create the transaction, and if found, check if it will be
-                          necessary to update the transaction status
-                        */
+                              add order, because recurrence creates all transactions in the
+                              first transaction when quantity is non-zero,search for the order by ID,
+                              if not found, create the transaction, and if found, check if it will be
+                              necessary to update the transaction status
+                            */
             const transactionId = String(gerateId(GalaxPayTransaction.galaxPayId));
             const { result } = await findOrderByTransactionId(transactionId);
             if (!result || !result.length) {
               // logger.log('> Not found Transaction in API')
-              if (!checkStatusNotValid(GalaxPayTransaction.status)
+              if (checkStatusPaid(galaxPayTransactionStatus)
                                 && checkPayDay(GalaxPayTransaction.payday)) {
                 // necessary to create order
                 return createTransaction(res, subscriptionLabel, plan, orderNumber, galaxpayFristTransactionId, GalaxPayTransaction, GalaxPaySubscription, GalaxPayTransactionValue, originalOrderId);
               }
-              // TODO: status 400 or 500?
-              return res.status(404).send('Status or checkPayDay invalid');
+              // fetches the original order again to avoid delay from other webhooks
+              let originalOrder;
+              try {
+                originalOrder = await findOrderById(originalOrderId);
+              } catch (err) {
+                logger.warn(`Original Order not found (${originalOrderId}) `);
+                res.status(404).send({ message: 'Original Order not found' });
+              }
+              logger.log(`>> Status Original Order: ${originalOrder?.status} `);
+              if (originalOrder && galaxpaySubscriptionStatus === 'canceled'
+                                && originalOrder?.status !== 'cancelled') {
+                // console.log('>> galaxpay webhook: Subscription canceled at galapay');
+                try {
+                  await api.patch(`orders/${originalOrderId}`, { status: 'cancelled' });
+                  collectionSubscription.doc(originalOrderId)
+                    .set({
+                      status: 'cancelled',
+                      updatedAt: new Date().toISOString(),
+                    }, { merge: true })
+                    .catch(logger.error);
+                  return res.sendStatus(200);
+                } catch (err) {
+                  logger.error(err);
+                  return res.sendStatus(400);
+                }
+              } else {
+                logger.log(`>> galaxpay webhook: Status or checkPayDay invalid => Payday: ${GalaxPayTransaction.payday} now: ${new Date().toISOString()}`);
+                return res.status(404).send('Status or checkPayDay invalid');
+              }
             }
             const order = result[0];
             if (order.financial_status
-                            && checkStatus(order.financial_status, GalaxPayTransaction)) {
+                            && checkStatusIsEqual(order.financial_status, galaxPayTransactionStatus)) {
+              // check status is equal
               // logger.log('> Equals Status')
               return res.sendStatus(200);
             }
             // logger.log('> Order id ')
             // update payment
+            let notificationCode = `;${GalaxPayTransaction.tid || ''};`;
+            notificationCode += `${GalaxPayTransaction.authorizationCode || ''}`;
             const bodyPaymentHistory = {
-              date_time: new Date().toISOString(),
-              status: parseStatus(GalaxPayTransaction.status),
+              date_time: transactionCreatedAt || new Date().toISOString(),
+              status: parseStatus(galaxPayTransactionStatus),
               transaction_id: transactionId,
-              notification_code: `${type};${galaxpayHook.webhookId}`,
+              notification_code: `${type};${galaxpayHook.webhookId}${notificationCode}`,
               flags: ['GalaxPay'],
             }; // TODO: incompatible type=> amount and status;
             await api.post(`orders/${order._id}/payments_history`, bodyPaymentHistory);
@@ -242,8 +306,8 @@ const handleWehook = async (req, res) => {
                 transaction_code: GalaxPayTransaction.authorizationCode || '',
               },
             });
-            if (parseStatus(GalaxPayTransaction.status) === 'voided'
-                            || parseStatus(GalaxPayTransaction.status) === 'refunded') {
+            if (parseStatus(galaxPayTransactionStatus) === 'voided'
+                            || parseStatus(galaxPayTransactionStatus) === 'refunded') {
               await api.patch(`orders/${order._id}`, { status: 'cancelled' });
               // logger.log('> UPDATE ORDER OK')
               return res.sendStatus(200);