cloudcommerce 0.2.1 → 0.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.cjs +1 -93
- package/CHANGELOG.md +37 -0
- package/ecomplus-stores/monocard/functions/ssr/package.json +2 -1
- package/ecomplus-stores/tia-sonia/functions/ssr/package.json +2 -1
- package/package.json +7 -7
- package/packages/api/package.json +1 -1
- package/packages/apps/correios/package.json +2 -2
- package/packages/apps/custom-payment/package.json +1 -1
- package/packages/apps/custom-shipping/package.json +1 -1
- package/packages/apps/datafrete/package.json +4 -4
- package/packages/apps/discounts/package.json +1 -1
- package/packages/apps/emails/package.json +2 -2
- package/packages/apps/fb-conversions/lib/fb-conversions-events.js +131 -111
- package/packages/apps/fb-conversions/lib/fb-conversions-events.js.map +1 -1
- package/packages/apps/fb-conversions/lib/functions-lib/create-fb-objects.js +69 -0
- package/packages/apps/fb-conversions/lib/functions-lib/create-fb-objects.js.map +1 -0
- package/packages/apps/fb-conversions/package.json +4 -4
- package/packages/apps/fb-conversions/src/fb-conversions-events.ts +173 -125
- package/packages/apps/fb-conversions/src/functions-lib/create-fb-objects.ts +104 -0
- package/packages/apps/frenet/package.json +4 -4
- package/packages/apps/galaxpay/lib/galaxpay-list-payments.d.ts +2 -2
- package/packages/apps/galaxpay/lib/galaxpay.d.ts +2 -2
- package/packages/apps/galaxpay/package.json +4 -4
- package/packages/apps/google-analytics/package.json +4 -4
- package/packages/apps/infinitepay/package.json +4 -4
- package/packages/apps/jadlog/package.json +2 -2
- package/packages/apps/loyalty-points/package.json +1 -1
- package/packages/apps/mercadopago/package.json +4 -4
- package/packages/apps/pagarme/package.json +4 -4
- package/packages/apps/paghiper/CHANGELOG.md +1 -0
- package/packages/apps/paghiper/README.md +1 -0
- package/packages/apps/paghiper/lib/functions-lib/create-axios.d.ts +2 -0
- package/packages/apps/paghiper/lib/functions-lib/create-axios.js +22 -0
- package/packages/apps/paghiper/lib/functions-lib/create-axios.js.map +1 -0
- package/packages/apps/paghiper/lib/functions-lib/handle-webhook.d.ts +3 -0
- package/packages/apps/paghiper/lib/functions-lib/handle-webhook.js +154 -0
- package/packages/apps/paghiper/lib/functions-lib/handle-webhook.js.map +1 -0
- package/packages/apps/paghiper/lib/index.d.ts +1 -0
- package/packages/apps/paghiper/lib/index.js +2 -0
- package/packages/apps/paghiper/lib/index.js.map +1 -0
- package/packages/apps/paghiper/lib/paghiper-create-transaction.d.ts +71 -0
- package/packages/apps/paghiper/lib/paghiper-create-transaction.js +199 -0
- package/packages/apps/paghiper/lib/paghiper-create-transaction.js.map +1 -0
- package/packages/apps/paghiper/lib/paghiper-list-payments.d.ts +7 -0
- package/packages/apps/paghiper/lib/paghiper-list-payments.js +97 -0
- package/packages/apps/paghiper/lib/paghiper-list-payments.js.map +1 -0
- package/packages/apps/paghiper/lib/paghiper-webhook.d.ts +5 -0
- package/packages/apps/paghiper/lib/paghiper-webhook.js +18 -0
- package/packages/apps/paghiper/lib/paghiper-webhook.js.map +1 -0
- package/packages/apps/paghiper/lib/paghiper.d.ts +76 -0
- package/packages/apps/paghiper/lib/paghiper.js +12 -0
- package/packages/apps/paghiper/lib/paghiper.js.map +1 -0
- package/packages/apps/paghiper/package.json +36 -0
- package/packages/apps/paghiper/src/functions-lib/create-axios.ts +21 -0
- package/packages/apps/paghiper/src/functions-lib/handle-webhook.ts +176 -0
- package/packages/apps/paghiper/src/index.ts +1 -0
- package/packages/apps/paghiper/src/paghiper-create-transaction.ts +242 -0
- package/packages/apps/paghiper/src/paghiper-list-payments.ts +127 -0
- package/packages/apps/paghiper/src/paghiper-webhook.ts +17 -0
- package/packages/apps/paghiper/src/paghiper.ts +12 -0
- package/packages/apps/paghiper/tsconfig.json +6 -0
- package/packages/apps/paghiper/types/config-app.d.ts +34 -0
- package/packages/apps/paghiper/webhook.js +1 -0
- package/packages/apps/pix/package.json +4 -4
- package/packages/apps/tiny-erp/lib/integration/post-tiny-erp.js.map +1 -1
- package/packages/apps/tiny-erp/package.json +4 -4
- package/packages/apps/tiny-erp/src/integration/post-tiny-erp.ts +1 -1
- package/packages/cli/package.json +1 -1
- package/packages/config/package.json +1 -1
- package/packages/emails/package.json +2 -2
- package/packages/events/lib/firebase.js +2 -0
- package/packages/events/lib/firebase.js.map +1 -1
- package/packages/events/package.json +4 -3
- package/packages/events/src/firebase.ts +2 -0
- package/packages/firebase/lib/config.d.ts +3 -0
- package/packages/firebase/lib/config.js +4 -0
- package/packages/firebase/lib/config.js.map +1 -1
- package/packages/firebase/package.json +3 -3
- package/packages/firebase/src/config.ts +4 -0
- package/packages/i18n/package.json +1 -1
- package/packages/modules/lib/firebase/call-app-module.js +12 -0
- package/packages/modules/lib/firebase/call-app-module.js.map +1 -1
- package/packages/modules/package.json +6 -5
- package/packages/modules/src/firebase/call-app-module.ts +12 -0
- package/packages/passport/package.json +3 -3
- package/packages/ssr/package.json +7 -7
- package/packages/storefront/.base.eslintrc.cjs +93 -0
- package/packages/storefront/.eslintrc.cjs +1 -1
- package/packages/storefront/astro.config.mjs +2 -0
- package/packages/storefront/client.d.ts +1 -1
- package/packages/storefront/config/storefront.cms.mjs +2 -2
- package/packages/storefront/dist/client/_astro/PitchBar.f3579a5b.js +1 -0
- package/packages/storefront/dist/client/_astro/Prices.8e5cead5.js +1 -0
- package/packages/storefront/dist/client/_astro/Prices.vue_vue_type_script_setup_true_lang.b8cbeb54.js +1 -0
- package/packages/storefront/dist/client/_astro/ProductCard.6d8b6d86.js +1 -0
- package/packages/storefront/dist/client/_astro/StickyHeader.7b0f3963.js +1 -0
- package/packages/storefront/dist/client/{assets/_...slug_.fea84512.css → _astro/_...slug_.97285eba.css} +1 -1
- package/packages/storefront/dist/client/_astro/client.3e777d4c.js +1 -0
- package/packages/storefront/dist/client/_astro/ecom-utils.92f137f6.js +1 -0
- package/packages/storefront/dist/client/_astro/hoisted.6edd7364.js +1 -0
- package/packages/storefront/dist/client/{assets → _astro}/index.90df622b.css +0 -0
- package/packages/storefront/dist/client/_astro/modules-info.dde776b4.js +1 -0
- package/packages/storefront/dist/client/_astro/runtime-core.esm-bundler.7cf33881.js +1 -0
- package/packages/storefront/dist/client/_astro/runtime-dom.esm-bundler.1a4c7407.js +1 -0
- package/packages/storefront/dist/client/{assets → _astro}/server.4d9646d8.css +0 -0
- package/packages/storefront/dist/client/_astro/session-utm.72684b84.js +1 -0
- package/packages/storefront/dist/client/{chunks/workbox-window.prod.es5.10f2e5ac.js → _astro/workbox-window.prod.es5.295a6886.js} +0 -0
- package/packages/storefront/dist/client/fallback/index.html +73 -0
- package/packages/storefront/dist/client/sw.js +1 -1
- package/packages/storefront/dist/server/chunks/astro.89bd9221.mjs +3378 -0
- package/packages/storefront/dist/server/chunks/pages/all.c27193d6.mjs +2195 -0
- package/packages/storefront/dist/server/chunks/prerender.89f63027.mjs +2 -0
- package/packages/storefront/dist/server/entry.mjs +516 -5742
- package/packages/storefront/package.json +9 -9
- package/packages/storefront/src/lib/components/Carousel.vue +1 -0
- package/packages/storefront/src/lib/components/CarouselControl.vue +1 -1
- package/packages/storefront/src/lib/components/PitchBar.vue +27 -10
- package/packages/storefront/src/lib/components/Prices.vue +24 -24
- package/packages/storefront/src/lib/components/StickyHeader.vue +56 -0
- package/packages/storefront/src/lib/layouts/Base.astro +6 -0
- package/packages/storefront/src/lib/layouts/BaseBody.astro +0 -1
- package/packages/storefront/src/lib/layouts/PagesHeader.astro +24 -3
- package/packages/storefront/src/lib/scripts/modules-info-preset.ts +60 -0
- package/packages/storefront/src/lib/ssr/Picture.astro +18 -0
- package/packages/storefront/src/lib/ssr/image.ts +12 -2
- package/packages/storefront/src/lib/ssr-context.ts +18 -4
- package/packages/storefront/src/lib/state/modules-info.ts +44 -14
- package/packages/storefront/src/lib/types/cms-settings.d.ts +2 -1
- package/packages/storefront/storefront.config.mjs +20 -8
- package/packages/storefront/tailwind.config.cjs +1 -1
- package/packages/types/index.ts +17 -0
- package/packages/types/package.json +1 -1
- package/packages/storefront/dist/client/PitchBar.afe7ff5c.js +0 -1
- package/packages/storefront/dist/client/Prices.eaf8a32c.js +0 -1
- package/packages/storefront/dist/client/ProductCard.1106b153.js +0 -1
- package/packages/storefront/dist/client/chunks/Prices.vue_vue_type_script_setup_true_lang.781b6501.js +0 -1
- package/packages/storefront/dist/client/chunks/ecom-utils.63984324.js +0 -1
- package/packages/storefront/dist/client/chunks/runtime-core.esm-bundler.fa6cdb60.js +0 -1
- package/packages/storefront/dist/client/chunks/session-utm.2de8b604.js +0 -1
- package/packages/storefront/dist/client/client.367a6497.js +0 -1
- package/packages/storefront/dist/client/hoisted.4671ed15.js +0 -1
package/.eslintrc.cjs
CHANGED
|
@@ -1,95 +1,3 @@
|
|
|
1
1
|
module.exports = {
|
|
2
|
-
|
|
3
|
-
browser: true,
|
|
4
|
-
es2020: true,
|
|
5
|
-
node: true,
|
|
6
|
-
},
|
|
7
|
-
extends: [
|
|
8
|
-
'plugin:vue/essential',
|
|
9
|
-
'airbnb-base',
|
|
10
|
-
],
|
|
11
|
-
parserOptions: {
|
|
12
|
-
ecmaVersion: 2020,
|
|
13
|
-
parser: '@typescript-eslint/parser',
|
|
14
|
-
sourceType: 'module',
|
|
15
|
-
},
|
|
16
|
-
plugins: [
|
|
17
|
-
'vue',
|
|
18
|
-
'@typescript-eslint',
|
|
19
|
-
],
|
|
20
|
-
ignorePatterns: [
|
|
21
|
-
'**/dist',
|
|
22
|
-
'**/types/*.d.ts',
|
|
23
|
-
],
|
|
24
|
-
settings: {
|
|
25
|
-
'import/resolver': {
|
|
26
|
-
node: {
|
|
27
|
-
extensions: ['.js', '.ts'],
|
|
28
|
-
},
|
|
29
|
-
},
|
|
30
|
-
},
|
|
31
|
-
rules: {
|
|
32
|
-
'import/no-unresolved': [
|
|
33
|
-
'error',
|
|
34
|
-
{
|
|
35
|
-
ignore: [
|
|
36
|
-
// https://github.com/import-js/eslint-plugin-import/issues/1810
|
|
37
|
-
'firebase-functions/logger',
|
|
38
|
-
'firebase-functions/v2/https',
|
|
39
|
-
'firebase-functions/v1',
|
|
40
|
-
'firebase-admin/app',
|
|
41
|
-
'firebase-admin/firestore',
|
|
42
|
-
'firebase-admin/auth',
|
|
43
|
-
'@astrojs/[^/]+$',
|
|
44
|
-
'astro/config',
|
|
45
|
-
'unocss/astro',
|
|
46
|
-
'unplugin-vue-components/*',
|
|
47
|
-
'unplugin-auto-import/*',
|
|
48
|
-
'@@.*',
|
|
49
|
-
'content/.*',
|
|
50
|
-
'~/.*',
|
|
51
|
-
],
|
|
52
|
-
},
|
|
53
|
-
],
|
|
54
|
-
'no-unused-vars': 'off',
|
|
55
|
-
'@typescript-eslint/no-unused-vars': ['error'],
|
|
56
|
-
'prefer-template': 'warn',
|
|
57
|
-
'no-nested-ternary': 'warn',
|
|
58
|
-
'no-await-in-loop': 'warn',
|
|
59
|
-
'no-shadow': 'warn',
|
|
60
|
-
'no-param-reassign': 'off',
|
|
61
|
-
'no-underscore-dangle': 'off',
|
|
62
|
-
'no-continue': 'off',
|
|
63
|
-
'lines-between-class-members': 'off',
|
|
64
|
-
'arrow-body-style': 'off',
|
|
65
|
-
'vue/no-multiple-template-root': 'off',
|
|
66
|
-
'import/extensions': [
|
|
67
|
-
'error',
|
|
68
|
-
'ignorePackages',
|
|
69
|
-
{ js: 'ignorePackages', ts: 'never' },
|
|
70
|
-
],
|
|
71
|
-
'padded-blocks': [
|
|
72
|
-
'error',
|
|
73
|
-
'never',
|
|
74
|
-
],
|
|
75
|
-
'padding-line-between-statements': [
|
|
76
|
-
'error',
|
|
77
|
-
{ blankLine: 'always', prev: ['directive', 'import', 'export'], next: '*' },
|
|
78
|
-
{ blankLine: 'always', prev: '*', next: ['directive', 'export'] },
|
|
79
|
-
{ blankLine: 'never', prev: 'directive', next: 'directive' },
|
|
80
|
-
{ blankLine: 'never', prev: 'import', next: 'import' },
|
|
81
|
-
],
|
|
82
|
-
'import/order': [
|
|
83
|
-
'error',
|
|
84
|
-
{ groups: ['type', 'builtin', 'external', 'parent', 'sibling', 'index'] },
|
|
85
|
-
],
|
|
86
|
-
'no-plusplus': [
|
|
87
|
-
'error',
|
|
88
|
-
{ allowForLoopAfterthoughts: true },
|
|
89
|
-
],
|
|
90
|
-
'no-multi-spaces': [
|
|
91
|
-
'error',
|
|
92
|
-
{ ignoreEOLComments: true },
|
|
93
|
-
],
|
|
94
|
-
},
|
|
2
|
+
extends: './packages/storefront/.base.eslintrc.cjs',
|
|
95
3
|
};
|
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,43 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [0.2.3](https://github.com/ecomplus/cloud-commerce/compare/v0.2.2...v0.2.3) (2023-01-26)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* **fb-conversions:** Handle new cart event to send `InitiateCheckout` ([#109](https://github.com/ecomplus/cloud-commerce/issues/109)) ([4fecb0f](https://github.com/ecomplus/cloud-commerce/commit/4fecb0f2fa5df546bae1115839677b4d486d2da4))
|
|
11
|
+
* **storefront:** Update deps to Astro v2 (and Vite 4) ([91d0dd7](https://github.com/ecomplus/cloud-commerce/commit/91d0dd73ca64356acb243385121a4967be7861eb))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
* **storefront:** Fix `Prices` component fade animations on values load ([d21b9f3](https://github.com/ecomplus/cloud-commerce/commit/d21b9f3ea409c14b55fdb35ae622a2a4a295498d))
|
|
17
|
+
* **storefront:** Minor fix typedef for `Picture` with Astro v4 ([8652bc8](https://github.com/ecomplus/cloud-commerce/commit/8652bc85397e05021d88ecba1484a59cdba2f04d))
|
|
18
|
+
|
|
19
|
+
### [0.2.2](https://github.com/ecomplus/cloud-commerce/compare/v0.2.1...v0.2.2) (2023-01-25)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Features
|
|
23
|
+
|
|
24
|
+
* **paghiper:** Create PagHiper app from https://github.com/ecomplus/app-paghiper ([#105](https://github.com/ecomplus/cloud-commerce/issues/105)) ([5f1c7c5](https://github.com/ecomplus/cloud-commerce/commit/5f1c7c5f5ba0f64d20637f403339e61c595e4633))
|
|
25
|
+
* **storefront:** Add /img and /assets Vite aliases to public dir on Astro config ([93a9da3](https://github.com/ecomplus/cloud-commerce/commit/93a9da389817818f0ba36e5e85353267d63e66ca))
|
|
26
|
+
* **storefront:** Add `parseShippingPhrase` util to modules info state exports ([6645159](https://github.com/ecomplus/cloud-commerce/commit/6645159c1f81a24898bc810d7206db7ddfa094df))
|
|
27
|
+
* **storefront:** Export new `getAspecRatio` on SSR image helpers ([7626a53](https://github.com/ecomplus/cloud-commerce/commit/7626a532ba400c58b0ba0d7b5c741bf905203ec6))
|
|
28
|
+
* **storefront:** Load modules info presets (payment, shipping) from CMS settings ([56afb71](https://github.com/ecomplus/cloud-commerce/commit/56afb71c9b05c34954b4ea56adf304abc0b281cb))
|
|
29
|
+
* **storefront:** New `ssr/Picture.astro` to automatically handle aspect ration for local images ([3da9bb2](https://github.com/ecomplus/cloud-commerce/commit/3da9bb2831c1f110497993e2f1c7fd1598f6b56b))
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
* **storefront:** Add SSR `global.storefront.onLoad` emitter and async load modules info preset ([235934d](https://github.com/ecomplus/cloud-commerce/commit/235934d46295ca41496ceb2be305c765d1aa337c))
|
|
35
|
+
* **storefront:** Also load modules info preset on SSR, prevents hydration mismatch ([911ab0e](https://github.com/ecomplus/cloud-commerce/commit/911ab0e6951fdbc82202e396aff60337a25fb49d))
|
|
36
|
+
* **storefront:** Config fallbacks to `config.json` when `ECOM_STORE_ID` not set (dev) ([13d8db7](https://github.com/ecomplus/cloud-commerce/commit/13d8db713928328ba229e58891fd5ce8b04d134c))
|
|
37
|
+
* **storefront:** Fix merged `CmsSettings` typedef and update `window.storefront` interface ([2dfee42](https://github.com/ecomplus/cloud-commerce/commit/2dfee422a9f782daaca8d37568d56fdad2c93a2a))
|
|
38
|
+
* **storefront:** Move base ES Lint config to Storefront codebase to be imported ([62c8ba4](https://github.com/ecomplus/cloud-commerce/commit/62c8ba446a88f68192d113bb9bbfd14d436db64d))
|
|
39
|
+
* **storefront:** Reduce default darken factor for brand colors pallete (bold) ([6441ef8](https://github.com/ecomplus/cloud-commerce/commit/6441ef8fa836958c0cf2f6e66df496e8934cf4ef))
|
|
40
|
+
* **storefront:** Update `PitchBar` to use `parseShippingPhrase` and check number of slides ([9c0fe4a](https://github.com/ecomplus/cloud-commerce/commit/9c0fe4aa48ceca87a433497edc5fd4f9d037f71f))
|
|
41
|
+
|
|
5
42
|
### [0.2.1](https://github.com/ecomplus/cloud-commerce/compare/v0.2.0...v0.2.1) (2023-01-21)
|
|
6
43
|
|
|
7
44
|
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.3",
|
|
5
5
|
"description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
|
|
6
6
|
"main": "packages/api/lib/index.js",
|
|
7
7
|
"author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
|
|
@@ -20,12 +20,12 @@
|
|
|
20
20
|
"@commitlint/config-conventional": "^17.4.2",
|
|
21
21
|
"@commitlint/rules": "^17.4.2",
|
|
22
22
|
"@types/node": "^18.11.18",
|
|
23
|
-
"@typescript-eslint/eslint-plugin": "^5.48.
|
|
24
|
-
"@typescript-eslint/parser": "^5.48.
|
|
25
|
-
"esbuild": "^0.17.
|
|
23
|
+
"@typescript-eslint/eslint-plugin": "^5.48.2",
|
|
24
|
+
"@typescript-eslint/parser": "^5.48.2",
|
|
25
|
+
"esbuild": "^0.17.4",
|
|
26
26
|
"eslint": "^8.32.0",
|
|
27
27
|
"eslint-config-airbnb-base": "^15.0.0",
|
|
28
|
-
"eslint-plugin-import": "^2.27.
|
|
28
|
+
"eslint-plugin-import": "^2.27.5",
|
|
29
29
|
"eslint-plugin-vue": "^9.9.0",
|
|
30
30
|
"husky": "^8.0.3",
|
|
31
31
|
"standard-version": "^9.5.0",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"turbo": "^1.6.3",
|
|
34
34
|
"typescript": "^4.9.4",
|
|
35
35
|
"uglify-js": "^3.17.4",
|
|
36
|
-
"vite": "^
|
|
37
|
-
"vitest": "^0.
|
|
36
|
+
"vite": "^4.0.4",
|
|
37
|
+
"vitest": "^0.28.2",
|
|
38
38
|
"zx": "^7.1.1"
|
|
39
39
|
},
|
|
40
40
|
"scripts": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/app-correios",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.3",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
|
|
6
6
|
"main": "lib/correios.js",
|
|
7
7
|
"repository": {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@cloudcommerce/api": "workspace:*",
|
|
23
|
-
"axios": "^1.2.
|
|
23
|
+
"axios": "^1.2.3",
|
|
24
24
|
"xml2js": "^0.4.23"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/app-datafrete",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.3",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
|
|
6
6
|
"main": "lib/datafrete.js",
|
|
7
7
|
"exports": {
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"@cloudcommerce/api": "workspace:*",
|
|
27
27
|
"@cloudcommerce/firebase": "workspace:*",
|
|
28
28
|
"@ecomplus/utils": "1.5.0-rc.3",
|
|
29
|
-
"axios": "^1.2.
|
|
30
|
-
"firebase-admin": "^11.
|
|
31
|
-
"firebase-functions": "^4.
|
|
29
|
+
"axios": "^1.2.3",
|
|
30
|
+
"firebase-admin": "^11.5.0",
|
|
31
|
+
"firebase-functions": "^4.2.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@cloudcommerce/types": "workspace:*",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/app-emails",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.3",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce default transactional email app",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"repository": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"@cloudcommerce/emails": "workspace:*",
|
|
24
24
|
"@cloudcommerce/firebase": "workspace:*",
|
|
25
25
|
"@ecomplus/transactional-mails": "^1.11.1",
|
|
26
|
-
"firebase-admin": "^11.
|
|
26
|
+
"firebase-admin": "^11.5.0",
|
|
27
27
|
"firebase-functions": "^3.24.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { createAppEventsFunction } from '@cloudcommerce/firebase/lib/helpers/pubsub';
|
|
2
2
|
import logger from 'firebase-functions/logger';
|
|
3
|
+
import { EventRequest, FacebookAdsApi } from 'facebook-nodejs-business-sdk';
|
|
4
|
+
import api from '@cloudcommerce/api';
|
|
3
5
|
import {
|
|
4
|
-
|
|
5
|
-
} from '
|
|
6
|
+
createContent, createCustonData, createServeEvent, createUserData,
|
|
7
|
+
} from './functions-lib/create-fb-objects.js';
|
|
6
8
|
|
|
7
9
|
const handleApiEvent = async ({
|
|
8
10
|
evName, apiEvent, apiDoc, app,
|
|
@@ -17,126 +19,144 @@ const handleApiEvent = async ({
|
|
|
17
19
|
return null;
|
|
18
20
|
}
|
|
19
21
|
logger.info(`> Webhook ${resourceId} [${evName}]`);
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
if (!clientUserAgent) {
|
|
38
|
-
clientUserAgent = order.client_user_agent;
|
|
39
|
-
}
|
|
40
|
-
try {
|
|
41
|
-
const buyer = order.buyers && order.buyers[0];
|
|
42
|
-
const clientIp = order.client_ip;
|
|
43
|
-
if (orderId && buyer && clientIp) {
|
|
44
|
-
// https://developers.facebook.com/docs/marketing-api/conversions-api/using-the-api#send
|
|
45
|
-
const fbPixelId = appData.fb_pixel_id;
|
|
46
|
-
const fbGraphToken = appData.fb_graph_token;
|
|
47
|
-
if (fbPixelId && fbGraphToken) {
|
|
48
|
-
FacebookAdsApi.init(fbGraphToken);
|
|
49
|
-
const userData = new UserData();
|
|
50
|
-
userData.setExternalId(buyer._id);
|
|
51
|
-
const emails = [];
|
|
52
|
-
buyer.emails?.forEach((email) => {
|
|
53
|
-
emails.push(email.address);
|
|
22
|
+
const fbPixelId = appData.fb_pixel_id;
|
|
23
|
+
const fbGraphToken = appData.fb_graph_token;
|
|
24
|
+
if (fbPixelId && fbGraphToken) {
|
|
25
|
+
FacebookAdsApi.init(fbGraphToken);
|
|
26
|
+
if (evName === 'orders-new') {
|
|
27
|
+
const order = apiDoc;
|
|
28
|
+
if (order.status === 'cancelled') {
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
const orderId = order._id;
|
|
32
|
+
let eventID;
|
|
33
|
+
let clientUserAgent;
|
|
34
|
+
if (order.metafields) {
|
|
35
|
+
const metafield = order.metafields.find(({ namespace, field }) => {
|
|
36
|
+
return namespace === 'fb' && field === 'pixel';
|
|
54
37
|
});
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
userData.setEmails(emails);
|
|
38
|
+
if (metafield) {
|
|
39
|
+
const { value } = metafield;
|
|
40
|
+
eventID = value.eventID;
|
|
41
|
+
clientUserAgent = value.userAgent;
|
|
60
42
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (shippingLine && shippingLine.to.zip) {
|
|
79
|
-
userData.setZip(shippingLine.to.zip.replace(/\D/g, ''));
|
|
80
|
-
if (shippingLine.to.province_code) {
|
|
81
|
-
userData.setState(shippingLine.to.province_code.toLowerCase());
|
|
82
|
-
userData.setCountry((shippingLine.to.country_code || 'BR').toLowerCase());
|
|
43
|
+
}
|
|
44
|
+
if (!clientUserAgent) {
|
|
45
|
+
clientUserAgent = order.client_user_agent;
|
|
46
|
+
}
|
|
47
|
+
try {
|
|
48
|
+
const buyer = order.buyers && order.buyers[0];
|
|
49
|
+
const clientIp = order.client_ip;
|
|
50
|
+
if (orderId && buyer && clientIp) {
|
|
51
|
+
// https://developers.facebook.com/docs/marketing-api/conversions-api/using-the-api#send
|
|
52
|
+
const userData = createUserData(buyer, clientIp);
|
|
53
|
+
const shippingLine = order.shipping_lines && order.shipping_lines[0];
|
|
54
|
+
if (shippingLine && shippingLine.to.zip) {
|
|
55
|
+
userData.setZip(shippingLine.to.zip.replace(/\D/g, ''));
|
|
56
|
+
if (shippingLine.to.province_code) {
|
|
57
|
+
userData.setState(shippingLine.to.province_code.toLowerCase());
|
|
58
|
+
userData.setCountry((shippingLine.to.country_code || 'BR').toLowerCase());
|
|
59
|
+
}
|
|
83
60
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
.setId(item.sku || item.product_id)
|
|
92
|
-
.setQuantity(item.quantity)
|
|
93
|
-
.setDeliveryCategory(DeliveryCategory.HOME_DELIVERY);
|
|
94
|
-
if (item.name) {
|
|
95
|
-
content.setTitle(item.name);
|
|
61
|
+
const contents = [];
|
|
62
|
+
const { items } = order;
|
|
63
|
+
if (items && items.length) {
|
|
64
|
+
items.forEach((item) => {
|
|
65
|
+
if (item.quantity > 0) {
|
|
66
|
+
const content = createContent(item);
|
|
67
|
+
contents.push(content);
|
|
96
68
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
const customData = createCustonData(contents, order.amount.total, order.currency_id);
|
|
72
|
+
const eventMs = Math.min(new Date(order.created_at || apiEvent.timestamp).getTime(), Date.now() - 3000);
|
|
73
|
+
logger.log(`>> #${orderId} (${eventID}) at ${eventMs}ms`);
|
|
74
|
+
let eventSourceUrl;
|
|
75
|
+
if (order.checkout_link) {
|
|
76
|
+
eventSourceUrl = order.checkout_link;
|
|
77
|
+
} else if (order.domain) {
|
|
78
|
+
eventSourceUrl = `https://${order.domain}`;
|
|
79
|
+
}
|
|
80
|
+
const serverEvent = createServeEvent('Purchase', eventMs, userData, customData, eventID || orderId, eventSourceUrl);
|
|
81
|
+
const eventsData = [serverEvent];
|
|
82
|
+
const eventRequest = (new EventRequest(fbGraphToken, fbPixelId))
|
|
83
|
+
.setEvents(eventsData);
|
|
84
|
+
try {
|
|
85
|
+
const response = await eventRequest.execute();
|
|
86
|
+
logger.info('>>Event sent: ', response);
|
|
87
|
+
return null;
|
|
88
|
+
} catch (err) {
|
|
89
|
+
logger.error(`Event request error: ${err.message} =>`, err);
|
|
90
|
+
return null;
|
|
91
|
+
}
|
|
117
92
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
93
|
+
logger.warn('>> OrderId , buyer or clientIp not found');
|
|
94
|
+
return null;
|
|
95
|
+
} catch (err) {
|
|
96
|
+
logger.error(`>>Error ${err.message} =>`, err);
|
|
97
|
+
throw err;
|
|
98
|
+
}
|
|
99
|
+
} else {
|
|
100
|
+
const cart = apiDoc;
|
|
101
|
+
if (cart.completed) {
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
const eventMs = Math.min(new Date(cart.created_at || apiEvent.timestamp).getTime(), Date.now() - 3000);
|
|
105
|
+
logger.log(`#${cart._id} at ${eventMs}ms`);
|
|
106
|
+
let customer;
|
|
107
|
+
if (cart.customers && cart.customers.length > 0) {
|
|
122
108
|
try {
|
|
123
|
-
|
|
124
|
-
logger.info('>> (App fb-conversions): ', response);
|
|
125
|
-
return null;
|
|
109
|
+
customer = (await api.get(`customers/${cart.customers[0]}`)).data;
|
|
126
110
|
} catch (err) {
|
|
127
|
-
logger.error(
|
|
128
|
-
|
|
111
|
+
logger.error('>> Error getting customer => ', err);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
let userData;
|
|
115
|
+
let address;
|
|
116
|
+
if (customer) {
|
|
117
|
+
userData = createUserData(customer);
|
|
118
|
+
if (customer.addresses && customer.addresses.length > 0) {
|
|
119
|
+
[address] = customer.addresses;
|
|
129
120
|
}
|
|
130
121
|
}
|
|
131
|
-
|
|
132
|
-
|
|
122
|
+
if (address && address.zip && userData) {
|
|
123
|
+
userData.setZip(address.zip.replace(/\D/g, ''));
|
|
124
|
+
if (address.province_code) {
|
|
125
|
+
userData.setState(address.province_code.toLowerCase());
|
|
126
|
+
userData.setCountry((address.country_code || 'BR').toLowerCase());
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
const contents = [];
|
|
130
|
+
const { items } = cart;
|
|
131
|
+
if (items && items.length) {
|
|
132
|
+
items.forEach((item) => {
|
|
133
|
+
if (item.quantity > 0) {
|
|
134
|
+
const content = createContent(item);
|
|
135
|
+
contents.push(content);
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
const customData = createCustonData(contents, cart.subtotal || 0);
|
|
140
|
+
let eventSourceUrl;
|
|
141
|
+
if (cart.permalink) {
|
|
142
|
+
eventSourceUrl = cart.permalink;
|
|
143
|
+
}
|
|
144
|
+
const serverEvent = createServeEvent('InitiateCheckout', eventMs, userData, customData, cart._id, eventSourceUrl);
|
|
145
|
+
const eventsData = [serverEvent];
|
|
146
|
+
const eventRequest = (new EventRequest(fbGraphToken, fbPixelId))
|
|
147
|
+
.setEvents(eventsData);
|
|
148
|
+
try {
|
|
149
|
+
const response = await eventRequest.execute();
|
|
150
|
+
logger.info('>> Event sent: ', response);
|
|
151
|
+
return null;
|
|
152
|
+
} catch (err) {
|
|
153
|
+
logger.error(`Event request error: ${err.message} =>`, err);
|
|
154
|
+
return null;
|
|
155
|
+
}
|
|
133
156
|
}
|
|
134
|
-
logger.warn('>> (App fb-conversions): orderId , buyer or clientIp not found');
|
|
135
|
-
return null;
|
|
136
|
-
} catch (err) {
|
|
137
|
-
logger.error(`>> (App fb-conversions) Error ${err.message} =>`, err);
|
|
138
|
-
throw err;
|
|
139
157
|
}
|
|
158
|
+
logger.warn('>> PixelId or fbToken not found');
|
|
159
|
+
return null;
|
|
140
160
|
};
|
|
141
161
|
|
|
142
162
|
export const fbconversions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fb-conversions-events.js","sourceRoot":"","sources":["../src/fb-conversions-events.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,uBAAuB,GAExB,MAAM,4CAA4C,CAAC;AACpD,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"fb-conversions-events.js","sourceRoot":"","sources":["../src/fb-conversions-events.ts"],"names":[],"mappings":"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"}
|