cloudcommerce 0.25.0 → 0.26.0

package/ecomplus-stores/iluminim/functions/ssr/src/assets/style.css

@@ -20,7 +20,7 @@ a, button, button > * {
 
 [class*=ui-btn] {
   @apply not-prose inline-block text-base font-medium px-4 py-2 rounded
-  border-2 border-transparent active:ring-2;
+  border-2 border-transparent focus:ring-1 active:ring-2;
 }
 .ui-btn-sm {
   @apply text-sm px-3 py-1.5 border-1;
@@ -61,5 +61,5 @@ a, button, button > * {
 }
 
 .ui-section {
-  @apply container mx-auto px-4 sm:px-0 my-6 md:my-8;
+  @apply container 2xl:max-w-7xl mx-auto px-4 sm:px-2 my-6 md:my-8;
 }

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

@@ -0,0 +1,149 @@
+<template>
+  <footer class="w-screen bg-base-50 border-t border-base-100 py-2">
+    <div class="ui-section">
+      <div class="pb-7 border-b border-base-200
+        flex justify-between flex-wrap lg:flex-nowrap sm:gap-x-10 gap-y-5">
+        <div class="shrink">
+          <slot name="logo" />
+          <div v-if="$settings.description" class="prose">
+            <p>{{ $settings.description }}</p>
+          </div>
+          <div class="flex gap-2 text-base-500">
+            <span v-for="(href, network) in socialNetworks" :key="network">
+              <SocialNetworkLink :network="network" class="p-1 hover:text-primary">
+                <template v-if="network === 'whatsapp'" #append>
+                  <span class="ml-1 text-sm text-base-600">
+                    {{ $settings.whatsapp }}
+                  </span>
+                </template>
+              </SocialNetworkLink>
+            </span>
+          </div>
+          <div v-if="$settings.address || $settings.phone" class="mt-3 text-base-700">
+            <address v-if="$settings.address" class="inline-block mr-4">
+              {{ $settings.address }}
+            </address>
+            <ALink
+              v-if="$settings.phone"
+              :href="`tel:${$settings.phone.replace(/\D/g, '')}`"
+              class="hover:text-primary"
+            >
+              <i class="i-phone mr-0.5"></i>
+              {{ $settings.phone }}
+            </ALink>
+          </div>
+        </div>
+        <div v-if="categories?.length" class="basis-1/2 sm:basis-auto">
+          <div class="text-lg font-medium mb-2.5">
+            {{ categoriesColTitle || $t.i19categories }}
+          </div>
+          <ul
+            class="text-sm"
+            :class="categories.length > 4
+              ? 'grid md:grid-cols-2 gap-x-5 gap-y-1.5' : 'space-y-1.5'"
+          >
+            <li v-for="({ name, slug }, i) in categories" :key="`c-${i}`">
+              <ALink :href="`/${slug}`" class="ui-link text-base-600">
+                {{ name }}
+              </ALink>
+            </li>
+            <li>
+              <ALink href="/s" class="ui-link text-base-900">
+                {{ $t.i19allProducts }}
+              </ALink>
+            </li>
+          </ul>
+        </div>
+        <div v-if="pageLinks?.length" class="basis-1/2 sm:basis-auto">
+          <div class="text-lg font-medium mb-2.5">
+            {{ pagesColTitle || $t.i19institutional }}
+          </div>
+          <ul
+            class="text-sm"
+            :class="pageLinks.length > 5
+              ? 'grid md:grid-cols-2 gap-x-5 gap-y-1.5' : 'space-y-1.5'"
+          >
+            <li v-for="({ title, href }, i) in pageLinks" :key="`p-${i}`">
+              <ALink :href="href" class="ui-link text-base-600">
+                {{ title }}
+              </ALink>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="ui-section">
+      <div class="flex flex-wrap lg:flex-nowrap justify-between items-start gap-5">
+        <ul class="flex gap-y-3 gap-x-6 lg:gap-x-8 items-center
+          md:flex-wrap mx-auto md:mx-0 overflow-x-auto md:overflow-hidden">
+          <li v-for="(stamp, i) in stamps" :key="i">
+            <ALink :href="stamp.href?.replace('{domain}', $settings.domain || '')">
+              <slot :name="`picture-${i}`" />
+              <span v-if="!stamp.img" class="flex items-center">
+                <span
+                  v-if="stamp.icon"
+                  class="text-4xl mr-2
+                  [&>*]:bg-gradient-to-br [&>*]:from-success-200 [&>*]:to-success-700"
+                >
+                  <i v-if="stamp.icon === 'lock'" class="i-lock-closed"></i>
+                  <i v-else-if="stamp.icon === 'check'" class="i-check-badge"></i>
+                  <i v-else class="i-arrow-path-rounded-square"></i>
+                </span>
+                <span class="text-sm font-medium text-base-600 max-w-[140px]">
+                  {{ stamp.alt }}
+                  <i
+                    v-if="stamp.href && stamp.href.charAt(0) !== '/'"
+                    class="bg-base-400 ml-0.5 i-arrow-top-right-on-square"
+                  ></i>
+                </span>
+              </span>
+            </ALink>
+          </li>
+        </ul>
+        <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"
+            :key="paymentMethod"
+            :flag="paymentMethod"
+          />
+        </div>
+      </div>
+      <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 }}
+          {{ $settings.address ? `/ ${$settings.address}` : '' }}
+          / {{ $settings.doc_number }}
+        </div>
+        <ALink href="https://www.ecomplus.io/" class="italic text-[#37003c]">
+          powered by <b>E-Com Plus</b>
+        </ALink>
+      </div>
+    </div>
+  </footer>
+</template>
+
+<script setup lang="ts">
+import type { Categories } from '@cloudcommerce/api/types';
+import type { LayoutContent } from '@@sf/content';
+import { socialNetworks } from '@@sf/sf-lib';
+import SocialNetworkLink from '@@sf/components/SocialNetworkLink.vue';
+import PaymentMethodFlag from '@@sf/components/PaymentMethodFlag.vue';
+
+export interface Props {
+  stamps?: LayoutContent['footer']['stamps'];
+  categories?: Array<Partial<Categories> & {
+    name: string;
+    slug: string;
+  }>;
+  categoriesColTitle?: string;
+  pageLinks?: Array<{
+    title: string;
+    href: string;
+  }>;
+  pagesColTitle?: string;
+}
+
+defineProps<Props>();
+</script>

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

@@ -7,8 +7,8 @@
       isSticky ? 'backdrop-blur-md shadow py-2 md:py-3' : 'py-3 sm:py-4 md:py-5',
     ]"
   >
-    <div class="container 2xl:max-w-7xl
-      mx-auto px-1 lg:pr-3 lg:pl-5 xl:pr-7 xl:pl-9 2xl:pr-0 2xl:pl-2
+    <div class="w-screen lg:w-[calc(100vw-1rem)] xl:max-w-[82rem] 2xl:max-w-[85rem]
+      mx-auto px-1 sm:pl-2 sm:pr-2.5 lg:px-1
       flex md:grid grid-flow-col grid-cols-3 lg:grid-cols-none lg:auto-cols-max
       justify-between items-center">
       <div class="basis-1/4 lg:hidden">

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

@@ -0,0 +1,68 @@
+---
+import { filterMainCategories } from '@@sf/composables/use-shop-header';
+import useSharedData from '@@sf/composables/use-shared-data';
+import Picture from '@@sf/components/Picture.astro';
+import {
+  type Props as ShopFooterProps,
+  default as ShopFooter,
+} from '~/components/ShopFooter.vue';
+
+const { routeContext } = Astro.locals;
+const { settings, getContent, isHomepage } = routeContext;
+const LogoHeading = isHomepage ? 'h2' : 'h3';
+const layoutContent = await getContent('layout');
+const {
+  footer: {
+    stamps,
+    categories_list: categoriesList,
+    pages_list: pagesList,
+  },
+} = layoutContent;
+let mainCategories: ShopFooterProps['categories'];
+let pageLinks: ShopFooterProps['pageLinks'];
+if (categoriesList?.enabled) {
+  if (categoriesList.categories?.length) {
+    mainCategories = categoriesList.categories;
+  } else {
+    // Will wait and reuse categories loaded from <PageHeader>
+    const { value: categories } = await useSharedData({ field: 'categories' });
+    mainCategories = filterMainCategories(categories);
+  }
+}
+if (pagesList?.enabled) {
+  if (pagesList.links?.length) {
+    pageLinks = pagesList.links;
+  } else {
+    pageLinks = [];
+    const pageSlugs = await getContent('extra-pages/');
+    for (let i = 0; i < pageSlugs.length; i++) {
+      const { title } = await getContent(`extra-pages/${pageSlugs[i]}`);
+      if (title) {
+        pageLinks.push({ title, href: `/p/${pageSlugs[i]}` });
+      }
+    }
+  }
+}
+---
+
+<ShopFooter
+  {stamps}
+  categories={mainCategories}
+  categoriesColTitle={categoriesList?.title}
+  {pageLinks}
+  pagesColTitle={pagesList?.title}
+>
+  <Fragment slot="logo">
+    <a href="/">
+      <LogoHeading>
+        <Picture
+          src={settings.logo}
+          alt={settings.name}
+          widths={[300]}
+          loading="lazy"
+          class="max-w-[150px]"
+        />
+      </LogoHeading>
+    </a>
+  </Fragment>
+</ShopFooter>

package/ecomplus-stores/iluminim/functions/ssr/src/layouts/PageHeader.astro

@@ -12,7 +12,7 @@ const {
   pitchBar,
   shopHeader: { categories, ...shopHeader },
 } = await usePageHeader({ routeContext });
-const { inlineClientJS } = useSharedData({
+const { inlineClientJS } = await useSharedData({
   field: 'categories',
   value: categories?.map(({ _id, ...c }) => c),
 });

package/ecomplus-stores/iluminim/functions/ssr/src/pages/index.astro

@@ -3,6 +3,7 @@ import loadRouteContext, { RouteContext } from '@@sf/ssr-context';
 import BaseHead from '@@sf/layouts/BaseHead.astro';
 import Base from '~/layouts/Base.astro';
 import PageHeader from '~/layouts/PageHeader.astro';
+import PageFooter from '~/layouts/PageFooter.astro';
 import HomeMain from '~/main/Home.astro';
 
 let routeContext: RouteContext | undefined;
@@ -29,6 +30,7 @@ try {
     <BaseHead slot="base-head" />
     <PageHeader />
     <HomeMain />
+    <PageFooter />
   </Base>
 }
 {loadError && <Fragment set:html={loadError.responseHTML} />}

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

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

package/ecomplus-stores/iluminim/package.json

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

package/ecomplus-stores/monocard/.idx/dev.nix

@@ -0,0 +1,24 @@
+{pkgs}: {
+  channel = "stable-23.05"; # "stable-23.05" or "unstable"
+  packages = [
+    pkgs.nodejs_18
+    pkgs.nodePackages.firebase-tools
+  ];
+  idx.extensions = [
+    "vue.volar"
+    # Other recommended extensions crashing launch
+    # "dbaeumer.vscode-eslint",
+    # "astro-build.astro-vscode",
+    # "bradlc.vscode-tailwindcss",
+  ];
+  idx.previews = {
+    enable = true;
+    previews = [
+      {
+        command = ["npm" "run" "dev" "--" "--port" "$PORT" "--host"];
+        manager = "web";
+        id = "web";
+      }
+    ];
+  };
+}

package/ecomplus-stores/tia-sonia/.idx/dev.nix

@@ -0,0 +1,24 @@
+{pkgs}: {
+  channel = "stable-23.05"; # "stable-23.05" or "unstable"
+  packages = [
+    pkgs.nodejs_18
+    pkgs.nodePackages.firebase-tools
+  ];
+  idx.extensions = [
+    "vue.volar"
+    # Other recommended extensions crashing launch
+    # "dbaeumer.vscode-eslint",
+    # "astro-build.astro-vscode",
+    # "bradlc.vscode-tailwindcss",
+  ];
+  idx.previews = {
+    enable = true;
+    previews = [
+      {
+        command = ["npm" "run" "dev" "--" "--port" "$PORT" "--host"];
+        manager = "web";
+        id = "web";
+      }
+    ];
+  };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.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>",
@@ -19,18 +19,18 @@
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
     "@commitlint/rules": "^17.7.0",
-    "@types/node": "^18.17.6",
-    "eslint": "^8.47.0",
+    "@types/node": "^18.17.12",
+    "eslint": "^8.48.0",
     "husky": "^8.0.3",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
-    "turbo": "^1.10.12",
+    "turbo": "^1.10.13",
     "typescript": "~5.0.4",
     "uglify-js": "^3.17.4",
     "vite": "^4.4.9",
-    "vitest": "^0.34.2",
+    "vitest": "^0.34.3",
     "zx": "^7.2.3",
-    "@cloudcommerce/eslint": "0.25.0"
+    "@cloudcommerce/eslint": "0.26.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.25.0",
+  "version": "0.26.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.25.0",
+  "version": "0.26.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.25.0",
+  "version": "0.26.0",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/correios.js",
   "repository": {
@@ -16,14 +16,16 @@
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/apps/correios#readme",
   "scripts": {
-    "build": "bash ../../../scripts/build-lib.sh"
+    "build": "bash ../../../scripts/build-lib.sh",
+    "test:e2e": "node --test tests/"
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "xml2js": "0.6.2"
   },
   "devDependencies": {
+    "@cloudcommerce/test-base": "workspace:*",
     "@cloudcommerce/types": "workspace:*"
   }
 }

package/packages/apps/correios/tests/calculate-shipping.test.mjs

@@ -0,0 +1,45 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import assert from 'node:assert';
+import test, { before, describe } from 'node:test';
+import {
+  modulesUrl,
+  bodyCalculateShipping,
+} from '@cloudcommerce/test-base';
+
+describe('Test Shipping Calculation in the Correios App', async () => {
+  let req;
+  let data;
+  const appId = 1248;
+
+  before(async () => {
+    req = await fetch(`${modulesUrl}/calculate_shipping?app_id=${appId}`, {
+      method: 'POST',
+      body: JSON.stringify(bodyCalculateShipping),
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+
+    data = (await req.json()).result;
+  });
+
+  test('Check Status 200', async () => {
+    assert.strictEqual(req?.status, 200);
+  });
+
+  test('Check validated is true', async () => {
+    assert.equal(data[0].validated, true);
+  });
+
+  test('Have shipping services', async () => {
+    assert.equal(data[0].response.shipping_services.length > 0, true);
+  });
+
+  test('Has PAC shipping services', async () => {
+    assert.equal((data[0].response.shipping_services.find((service) => service.label === 'PAC')).label, 'PAC');
+  });
+
+  test('Has SEDEX shipping services', async () => {
+    assert.equal((data[0].response.shipping_services.find((service) => service.label === 'SEDEX')).label, 'SEDEX');
+  });
+});

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.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.25.0",
+  "version": "0.26.0",
   "description": "E-Com Plus Cloud Commerce app for custom shipping methods",
   "main": "lib/custom-shipping.js",
   "repository": {
@@ -16,12 +16,14 @@
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/apps/custom-shipping#readme",
   "scripts": {
-    "build": "bash ../../../scripts/build-lib.sh"
+    "build": "bash ../../../scripts/build-lib.sh",
+    "test:e2e": "node --test tests/"
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*"
   },
   "devDependencies": {
+    "@cloudcommerce/test-base": "workspace:*",
     "@cloudcommerce/types": "workspace:*"
   }
 }

package/packages/apps/custom-shipping/tests/calculate-shipping.test.mjs

@@ -0,0 +1,37 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import assert from 'node:assert';
+import test, { before, describe } from 'node:test';
+import {
+  modulesUrl,
+  bodyCalculateShipping,
+} from '@cloudcommerce/test-base';
+
+describe('Test Shipping Calculation in the Custom Shipping App', async () => {
+  let req;
+  let data;
+  const appId = 1253;
+
+  before(async () => {
+    req = await fetch(`${modulesUrl}/calculate_shipping?app_id=${appId}`, {
+      method: 'POST',
+      body: JSON.stringify(bodyCalculateShipping),
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+
+    data = (await req.json()).result;
+  });
+
+  test('Check Status 200', async () => {
+    assert.strictEqual(req?.status, 200);
+  });
+
+  test('Check validated is true', async () => {
+    assert.equal(data[0].validated, true);
+  });
+
+  test('Have shipping services', async () => {
+    assert.equal(data[0].response.shipping_services.length > 0, true);
+  });
+});

package/packages/apps/datafrete/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-datafrete",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {
@@ -26,7 +26,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.5",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "firebase-admin": "^11.10.1",
     "firebase-functions": "^4.4.1"
   },

package/packages/apps/discounts/package.json

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

package/packages/apps/emails/package.json

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

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.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.25.0",
+  "version": "0.26.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "firebase-functions": "^4.4.1"
   },
   "devDependencies": {

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "firebase-admin": "^11.10.1",
     "firebase-functions": "^4.4.1"
   },

package/packages/apps/galaxpay/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "firebase-admin": "^11.10.1",
     "firebase-functions": "^4.4.1"
   },