cloudcommerce 0.27.0 → 0.28.0

package/ecomplus-stores/monocard/functions/ssr/package.json

@@ -17,15 +17,15 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/api": "^0.26.7",
-    "@cloudcommerce/firebase": "^0.26.7",
-    "@cloudcommerce/ssr": "^0.26.7",
+    "@cloudcommerce/api": "^0.27.0",
+    "@cloudcommerce/firebase": "^0.27.0",
+    "@cloudcommerce/ssr": "^0.27.0",
     "@vueuse/motion": "2.0.0-beta.22"
   },
   "devDependencies": {
-    "@cloudcommerce/i18n": "^0.26.7",
-    "@cloudcommerce/storefront": "^0.26.7",
-    "@cloudcommerce/types": "^0.26.7",
+    "@cloudcommerce/i18n": "^0.27.0",
+    "@cloudcommerce/storefront": "^0.27.0",
+    "@cloudcommerce/types": "^0.27.0",
     "@fontsource-variable/inter": "^5.0.8",
     "@iconify-json/ri": "^1.1.8",
     "@iconify-json/wpf": "^1.1.4",

package/ecomplus-stores/monocard/functions/ssr/src/components/AccountMenu.vue

@@ -40,7 +40,7 @@
           <MenuItem
             as="li"
             v-slot="{ active }"
-            v-for="({ title, href }, i) in $settings.service_links"
+            v-for="({ title, href }, i) in $settings.serviceLinks"
             :key="`s-${i}`"
           >
             <ALink

package/ecomplus-stores/monocard/functions/ssr/src/components/DocDescription.vue

@@ -0,0 +1,33 @@
+<template>
+  <section v-if="html" class="ui-section">
+    <details class="[&_i]:open:rotate-180" open>
+      <summary role="button" class="text-base-700 hover:text-base-800
+        [&>i]:hover:text-primary my-4 list-none text-2xl
+        font-medium lowercase md:my-5">
+        <i class="i-chevron-down mr-1"></i>
+        <span>{{ title || $t.i19description }}</span>
+      </summary>
+      <ContentClearfix :html="html" />
+    </details>
+  </section>
+</template>
+
+<script setup lang="ts">
+import type {
+  Products,
+  Categories,
+  Brands,
+  Collections,
+} from '@cloudcommerce/api/types';
+import ContentClearfix from '@@sf/components/ContentClearfix.vue';
+
+export interface Props {
+  apiDoc?: Partial<Products | Categories | Brands | Collections>;
+  title?: string;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  apiDoc: () => globalThis.$storefront.apiContext?.doc as Products,
+});
+const html = computed(() => props.apiDoc.body_html || props.apiDoc.body_text);
+</script>

package/ecomplus-stores/monocard/functions/ssr/src/components/FeatureTabs.vue

@@ -135,7 +135,7 @@
           <div class="mt-5 flex gap-3 lg:gap-4
             text-xl lg:text-2xl font-brand lowercase">
             <a
-              :href="$settings.metafields?.monocard_slug"
+              :href="$settings.metafields?.monocardSlug"
               class="primary border-4 border-primary
               hover:border-primary-bold active:primary-bold
               rounded-full px-4 py-1.5 lg:px-7 lg:py-3"
@@ -143,7 +143,7 @@
               Monte seu Monocard
             </a>
             <a
-              :href="$settings.metafields?.business_lp_url"
+              :href="$settings.metafields?.businessLpUrl"
               class="hidden sm:block
               bg-transparent text-black border-4 border-primary
               hover:bg-primary-100 hover:border-primary-bold active:primary-bold
@@ -225,7 +225,7 @@
               </span>
             </a>
             <a
-              :href="$settings.metafields?.business_lp_url"
+              :href="$settings.metafields?.businessLpUrl"
               class="grow sm:grow-0
               bg-transparent text-black border-4 border-primary
               hover:bg-primary-100 hover:border-primary-bold active:primary-bold

package/ecomplus-stores/monocard/functions/ssr/src/components/ShopFooter.vue

@@ -82,7 +82,7 @@
         <div class="flex flex-wrap md:flex-nowrap justify-end items-center
           gap-4 text-2xl mx-auto md:mx-0 overflow-x-auto md:overflow-hidden">
           <PaymentMethodFlag
-            v-for="paymentMethod in $settings.payment_methods"
+            v-for="paymentMethod in $settings.paymentMethods"
             :key="paymentMethod"
             :flag="paymentMethod"
             class="!text-base-50"
@@ -92,9 +92,9 @@
       <div class="mt-7 text-xs text-center md:text-left
         md:flex justify-between gap-4">
         <div class="mb-3 md:mb-0">
-          @ {{ new Date().getFullYear() }} {{ $settings.corporate_name }}
+          @ {{ new Date().getFullYear() }} {{ $settings.corporateName }}
           {{ $settings.address ? `/ ${$settings.address}` : '' }}
-          / {{ $settings.doc_number }}
+          / {{ $settings.docNumber }}
         </div>
         <ALink href="https://www.ecomplus.io/" class="italic text-[rgb(239,235,240)]">
           powered by <b>E-Com Plus</b>

package/ecomplus-stores/monocard/functions/ssr/src/components/ShopHeader.vue

@@ -89,7 +89,6 @@ import {
   watch,
   onMounted,
   defineAsyncComponent,
-  getCurrentInstance,
 } from 'vue';
 import { watchOnce } from '@vueuse/core';
 import { totalItems } from '@@sf/state/shopping-cart';
@@ -134,18 +133,11 @@ onMounted(() => {
     delayedTotalItems.value = newTotalItems;
   }, { immediate: true });
 });
-const vm = getCurrentInstance();
-const metafields = {
-  support_url: '',
-  business_lp_url: '',
-  monocard_slug: '',
-  monodot_slug: '',
-  ...vm?.appContext.app.config.globalProperties.$settings.metafields,
-};
 const headerNavLinks = {
-  supportUrl: metafields.support_url,
-  businessLpUrl: metafields.business_lp_url,
-  monocardSlug: metafields.monocard_slug,
-  monodotSlug: metafields.monodot_slug,
+  supportUrl: '',
+  businessLpUrl: '',
+  monocardSlug: '',
+  monodotSlug: '',
+  ...globalThis.$storefront.settings.metafields
 };
 </script>

package/ecomplus-stores/monocard/functions/ssr/src/layouts/PageFooter.astro

@@ -11,11 +11,11 @@ const layoutContent = await getContent('layout');
 const {
   footer: {
     stamps,
-    pages_list: pagesList,
+    pagesList,
   },
 } = layoutContent;
 let pageLinks: ShopFooterProps['pageLinks'];
-if (pagesList?.enabled) {
+if (pagesList?.isActive) {
   if (pagesList.links?.length) {
     pageLinks = pagesList.links;
   } else {

package/ecomplus-stores/monocard/functions/ssr/src/main/Home.astro

@@ -30,7 +30,7 @@ const { settings } = routeContext;
               basis-1/2 lg:basis-auto rounded-full px-4 py-2.5 xl:px-7 xl:py-4">
               Compre agora
             </a>
-            <a role="button" href={settings.metafields.business_lp_url}
+            <a role="button" href={settings.metafields.businessLpUrl}
               class="bg-primary/40 text-primary-900 lg:border-4 border-primary/20
               hover:primary hover:border-primary-bold active:primary-bold
               basis-1/2 lg:basis-auto rounded-full px-4 py-2.5 xl:px-7 xl:py-4">

package/ecomplus-stores/monocard/functions/ssr/src/main/Sections.astro

@@ -3,7 +3,7 @@ import { usePageSections } from '@@sf/layouts/use-page-main';
 import BannersGrid from '~/components/BannersGrid.astro';
 import ProductShelf from '~/components/ProductShelf.vue';
 import Breadcrumbs from '~/components/Breadcrumbs.astro';
-import DocDescription from '~/components/DocDescription.astro';
+import DocDescription from '~/components/DocDescription.vue';
 
 const { routeContext } = Astro.locals;
 const { sections } = await usePageSections({

package/ecomplus-stores/monocard/functions/with-apps/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/events": "^0.26.7",
-    "@cloudcommerce/firebase": "^0.26.7",
-    "@cloudcommerce/modules": "^0.26.7"
+    "@cloudcommerce/events": "^0.27.0",
+    "@cloudcommerce/firebase": "^0.27.0",
+    "@cloudcommerce/modules": "^0.27.0"
   }
 }

package/ecomplus-stores/monocard/package.json

@@ -23,9 +23,9 @@
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "dependencies": {
-    "@cloudcommerce/cli": "^0.26.7"
+    "@cloudcommerce/cli": "^0.27.0"
   },
   "devDependencies": {
-    "@cloudcommerce/eslint": "^0.26.7"
+    "@cloudcommerce/eslint": "^0.27.0"
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
   "main": "packages/api/lib/index.js",
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
@@ -30,7 +30,7 @@
     "vite": "^4.4.9",
     "vitest": "^0.34.6",
     "zx": "^7.2.3",
-    "@cloudcommerce/eslint": "0.27.0"
+    "@cloudcommerce/eslint": "0.28.0"
   },
   "scripts": {
     "fix-install": "bash scripts/pre-install.sh && pnpm i",

package/packages/api/package.json

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

package/packages/apps/affilate-program/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-affilate-program",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for simple affiliate program",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/correios/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-correios",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/correios.js",
   "repository": {

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.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.27.0",
+  "version": "0.28.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.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {

package/packages/apps/discounts/package.json

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

package/packages/apps/emails/lib/functios-lib/utils.js

@@ -20,7 +20,7 @@ const getStore = () => {
     lang: settingsContent.lang,
     domain: settingsContent.domain,
     name: settingsContent.name,
-    corporate_name: settingsContent.corporate_name || settingsContent.name,
+    corporate_name: settingsContent.corporateName || settingsContent.name,
     contact_email: settingsContent.email,
     logo: {
       url: `https://${settingsContent.domain}${settingsContent.logo}`,

package/packages/apps/emails/lib/functios-lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/functios-lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,sBAAsB,GAAG,CAC7B,OAAmB,EACnB,WAAmB,EACnB,eAAuC,EACvC,UAAkB,EAClB,EAAE;IACF,MAAM,cAAc,GAAW,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;IAElF,MAAM,IAAI,GAAG;QACX,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACF,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,WAAW,IAAI,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IACrC,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACvD,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;QAChC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;IACpB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACzC,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,cAAc,EAAE,eAAe,CAAC,cAAc,IAAI,eAAe,CAAC,IAAI;QACtE,aAAa,EAAE,eAAe,CAAC,KAAK;QACpC,IAAI,EAAE;YACJ,GAAG,EAAE,WAAW,eAAe,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE;SAChE;QACD,OAAO,EAAE,eAAe,CAAC,OAAO;KACjC,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,EACL,sBAAsB,EACtB,WAAW,EACX,QAAQ,GACT,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/functios-lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,sBAAsB,GAAG,CAC7B,OAAmB,EACnB,WAAmB,EACnB,eAAuC,EACvC,UAAkB,EAClB,EAAE;IACF,MAAM,cAAc,GAAW,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;IAElF,MAAM,IAAI,GAAG;QACX,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACF,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,WAAW,IAAI,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IACrC,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACvD,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;QAChC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;IACpB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACzC,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,cAAc,EAAE,eAAe,CAAC,aAAa,IAAI,eAAe,CAAC,IAAI;QACrE,aAAa,EAAE,eAAe,CAAC,KAAK;QACpC,IAAI,EAAE;YACJ,GAAG,EAAE,WAAW,eAAe,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE;SAChE;QACD,OAAO,EAAE,eAAe,CAAC,OAAO;KACjC,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,EACL,sBAAsB,EACtB,WAAW,EACX,QAAQ,GACT,CAAC"}

package/packages/apps/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-emails",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce default transactional email app",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/emails/src/functios-lib/utils.ts

@@ -29,7 +29,7 @@ const getStore = () => {
     lang: settingsContent.lang,
     domain: settingsContent.domain,
     name: settingsContent.name,
-    corporate_name: settingsContent.corporate_name || settingsContent.name,
+    corporate_name: settingsContent.corporateName || settingsContent.name,
     contact_email: settingsContent.email,
     logo: {
       url: `https://${settingsContent.domain}${settingsContent.logo}`,

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders to Facebook Conversions API",
   "main": "lib/index.js",
   "repository": {

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-flash-courier",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {

package/packages/apps/galaxpay/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {

package/packages/apps/google-analytics/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-google-analytics",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders events to GA Measurement Protocol",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/jadlog/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-jadlog",
   "type": "module",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce  app for Jadlog shipping calculation",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/loyalty-points/lib/functions-lib/cron-add-points.d.ts

@@ -0,0 +1,2 @@
+declare const addPoints: () => Promise<void>;
+export default addPoints;

package/packages/apps/loyalty-points/lib/functions-lib/cron-add-points.js

@@ -0,0 +1,98 @@
+import logger from 'firebase-functions/logger';
+import { getFirestore } from 'firebase-admin/firestore';
+import api from '@cloudcommerce/api';
+
+const addPoints = async () => {
+  const d = new Date();
+  // double checking paid orders after 5 days
+  d.setDate(d.getDate() - 5);
+  const db = getFirestore();
+  const snapshot = await db.collection('pointsToAdd')
+    .where('queuedAt', '<=', d)
+    .orderBy('queuedAt')
+    .get();
+  const { docs } = snapshot;
+  logger.info(`${docs.length} points to add`);
+  for (let i = 0; i < docs.length; i++) {
+    const { customerId, pointEntries } = docs[i].data();
+    const orderId = docs[i].ref.id;
+    let order;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      order = (await api.get(`orders/${orderId}`)).data;
+    } catch (error) {
+      const status = error.response?.status;
+      if (status > 400 && status < 500) {
+        logger.warn(`failed reading order ${orderId}`, {
+          status,
+          response: error.response?.data,
+        });
+      } else {
+        throw error;
+      }
+    }
+    if (order && Array.isArray(pointEntries) && pointEntries.length) {
+      const currentStatus = order.financial_status && order.financial_status.current;
+      if (currentStatus === 'paid') {
+        const tryAddPoints = (data) => {
+          logger.info(`POST ${JSON.stringify(data)} ${customerId}`);
+          return api.post(`customers/${customerId}/loyalty_points_entries`, data);
+        };
+        const pointsEndpoint = `/customers/${customerId}/loyalty_points_entries`;
+        for (let ii = 0; ii < pointEntries.length; ii++) {
+          const pointsEntry = pointEntries[ii];
+          try {
+            // eslint-disable-next-line no-await-in-loop
+            await tryAddPoints(pointsEntry);
+          } catch (err) {
+            const status = err.response?.status;
+            if (status === 403) {
+              // delete older points entry and retry
+              const findUrl = `${pointsEndpoint}`
+                                + `?valid_thru<=${(new Date().toISOString())}&sort=active_points&limit=1`;
+              try {
+                // eslint-disable-next-line no-await-in-loop
+                await api.get(findUrl)
+                  .then(({ data }) => {
+                    const pointsList = data.result;
+                    if (pointsList.length) {
+                      const endpoint = `${pointsEndpoint}/${pointsList[0]._id}`;
+                      return api.delete(endpoint)
+                        .then(() => {
+                          return tryAddPoints(pointsEntry);
+                        });
+                    }
+                    return null;
+                  });
+              } catch (error) {
+                logger.warn(`failed cleaning/adding points retry to ${orderId}`, {
+                  customerId,
+                  pointsEntry,
+                  url: error.config?.url,
+                  method: error.config?.method,
+                  status: error.response?.status,
+                  response: error.response?.data,
+                });
+              }
+            } else if (status > 400 && status < 500) {
+              logger.warn(`failed adding points to ${orderId}`, {
+                customerId,
+                pointsEndpoint,
+                pointsEntry,
+                status,
+                response: err.response.data,
+              });
+            } else {
+              throw err;
+            }
+          }
+        }
+      }
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await docs[i].ref.delete();
+  }
+};
+
+export default addPoints;
+// # sourceMappingURL=cron-add-points.js.map

package/packages/apps/loyalty-points/lib/functions-lib/cron-add-points.js.map

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

package/packages/apps/loyalty-points/lib/functions-lib/handle-loyalty-points-event.js

@@ -1,6 +1,7 @@
 import api from '@cloudcommerce/api';
-import { getFirestore } from 'firebase-admin/firestore';
+import { getFirestore, Timestamp } from 'firebase-admin/firestore';
 import logger from 'firebase-functions/logger';
+import ecomUtils from '@ecomplus/utils';
 import getProgramId from './get-program-id.js';
 
 const ECHO_SUCCESS = 'SUCCESS';
@@ -79,32 +80,67 @@ const handleLoyaltyPointsEvent = async (order, programRules) => {
         if (pointsList) {
           const hasEarnedPoints = haveEarnedPoints(pointsList, orderId);
           if (isPaid && !hasEarnedPoints) {
-            for (let i = 0; i < programRules.length; i++) {
-              const rule = programRules[i];
-              if (amount.subtotal) {
-                if (!rule.min_subtotal_to_earn || rule.min_subtotal_to_earn <= amount.subtotal) {
+            const docRef = getFirestore().doc(`pointsToAdd/${orderId}`);
+            const docSnapshot = await docRef.get();
+            if (!docSnapshot.exists) {
+              const pointEntries = [];
+              for (let i = 0; i < programRules.length; i++) {
+                const rule = programRules[i];
+                if (rule.earn_percentage === 0) {
+                  continue;
+                }
+                if (!rule.min_subtotal_to_earn
+                                    || (amount?.subtotal && rule.min_subtotal_to_earn <= amount.subtotal)) {
+                  let subtotal = amount.subtotal;
+                  if (Array.isArray(rule.category_ids) && rule.category_ids.length) {
+                    if (!order.items || !order.items.length) {
+                      continue;
+                    }
+                    // eslint-disable-next-line no-await-in-loop
+                    const { data: { result } } = await api.get('search/v1', {
+                      limit: order.items.length,
+                      params: {
+                        _id: order.items.map((item) => item.product_id),
+                        'categories._id': rule.category_ids,
+                      },
+                    });
+                    // eslint-disable-next-line no-await-in-loop
+                    order.items.forEach((item) => {
+                      if (!result.find(({ _id }) => _id === item.product_id)) {
+                        subtotal -= (ecomUtils.price(item) * item.quantity);
+                      }
+                    });
+                  }
                   const pointsValue = ((rule.earn_percentage || 1) / 100)
-                                        * (amount.subtotal - (amount.discount || 0));
-                  let validThru;
-                  if (rule.expiration_days > 0) {
-                    const d = new Date();
-                    d.setDate(d.getDate() + rule.expiration_days);
-                    validThru = d.toISOString();
+                                        * (subtotal - (amount.discount || 0));
+                  if (pointsValue > 0) {
+                    let validThru;
+                    if (rule.expiration_days > 0) {
+                      const d = new Date();
+                      d.setDate(d.getDate() + 2 + rule.expiration_days);
+                      validThru = d.toISOString();
+                    }
+                    const data = {
+                      name: rule.name,
+                      program_id: getProgramId(rule, i),
+                      earned_points: pointsValue,
+                      active_points: pointsValue,
+                      ratio: rule.ratio || 1,
+                      order_id: orderId,
+                    };
+                    if (validThru) {
+                      Object.assign(data, { valid_thru: validThru });
+                    }
+                    pointEntries.push(data);
                   }
-                  const data = {
-                    name: rule.name,
-                    program_id: getProgramId(rule, i),
-                    earned_points: pointsValue,
-                    active_points: pointsValue,
-                    ratio: rule.ratio || 1,
-                    valid_thru: validThru,
-                    order_id: orderId,
-                  }; // TODO: set the correct type
-                  // eslint-disable-next-line no-await-in-loop
-                  await api.post(`customers/${customerId}/loyalty_points_entries`, data);
-                  return responsePubSub(ECHO_SUCCESS);
                 }
               }
+              await docRef.set({
+                customerId,
+                pointEntries,
+                queuedAt: Timestamp.now(),
+              });
+              return responsePubSub(ECHO_SUCCESS);
             }
           }
           if (isCancelled && hasEarnedPoints) {