Merge branch 'develop' into main

vuestorefront-community · Feb 4, 2023 · 6baccc8 · 6baccc8
2 parents 5a4643f + 3faa2b9
commit 6baccc8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop-api",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": false,
   "sideEffects": false,
   "server": "server/index.js",

diff --git a/packages/composables/package.json b/packages/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": false,
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -16,7 +16,7 @@
     "update:update": "ncu -u"
   },
   "dependencies": {
-    "@vue-storefront/prestashop-api": "1.2.0",
+    "@vue-storefront/prestashop-api": "1.2.1",
     "@vue-storefront/core": "~2.7.5"
   },
   "devDependencies": {

diff --git a/packages/composables/src/getters/facetGetters.ts b/packages/composables/src/getters/facetGetters.ts
@@ -113,7 +113,7 @@ function getBreadcrumbs(params: FacetSearchResult<Facet>): AgnosticBreadcrumb[]
   return [];
 }
 
-export const facetGetters: FacetsGetters<Facet, FacetSearchCriteria> = {
+export const facetGetters: FacetsGetters<Facet, PsProduct[], FacetSearchCriteria> = {
   getSortOptions,
   getGrouped,
   getAll,

diff --git a/packages/composables/src/helpers/populateCategoryProducts.ts b/packages/composables/src/helpers/populateCategoryProducts.ts
@@ -1,6 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const populateCategoryProducts = (psProducts: Array<any>) => {
-  const populateCategoryProducts = psProducts.map((product) => ({
+  return psProducts.map((product) => ({
     id: product.id_product,
     name: product.name,
     slug: product.link_rewrite,
@@ -14,10 +14,9 @@ const populateCategoryProducts = (psProducts: Array<any>) => {
     shortDescription: null,
     brand: null,
     category: null,
-    productInfo: null
+    productInfo: null,
+    quantity: product.quantity
   }));
-
-  return populateCategoryProducts;
 };
 
 export default populateCategoryProducts;
diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop-theme",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "build": "nuxt build -m",
@@ -24,7 +24,7 @@
     "@vue-storefront/middleware": "~2.7.5",
     "@vue-storefront/nuxt": "~2.7.5",
     "@vue-storefront/nuxt-theme": "~2.7.5",
-    "@vue-storefront/prestashop": "1.2.0",
+    "@vue-storefront/prestashop": "1.2.1",
     "cookie-universal-nuxt": "^2.1.5",
     "core-js": "^3.19.0",
     "nuxt": "^2.15.8",

diff --git a/yarn.lock b/yarn.lock
@@ -3937,7 +3937,7 @@
     "@typescript-eslint/types" "4.31.2"
     eslint-visitor-keys "^2.0.0"
 
-"@vue-storefront/core@~2.7.1", "@vue-storefront/core@~2.7.5":
+"@vue-storefront/core@~2.7.5":
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/@vue-storefront/core/-/core-2.7.5.tgz#69b629d1c540f52e39220de18fb6e836552ea240"
   integrity sha512-mtUXY5FtFEUKUDcaOWGvOuYpPzT9nMvbJ1Z8CjcT48y4bEEnaq6doiAsMFGXGvUFJzOXqXiN3jpRZ3q9QRAsyA==
@@ -3947,7 +3947,7 @@
     lodash-es "^4.17.15"
     vue "^2.6.11"
 
-"@vue-storefront/middleware@~2.7.1":
+"@vue-storefront/middleware@~2.7.5":
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/@vue-storefront/middleware/-/middleware-2.7.5.tgz#b4654a7a08264973347153daa3d11345d35233bb"
   integrity sha512-K79iuf8vLF5XbW65Ycx46jahTpIaI4Nim+Yl3guT+k8it3U3OQsjbI0K0ExALPOGDxwpIMxbQzKlCa3ACvF0+w==
@@ -3959,7 +3959,7 @@
     express "^4.17.1"
     helmet "^5.0.2"
 
-"@vue-storefront/nuxt-theme@~2.7.1":
+"@vue-storefront/nuxt-theme@~2.7.5":
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt-theme/-/nuxt-theme-2.7.5.tgz#be4671a6692e0db50d24950ca61fe3e1316fb1dc"
   integrity sha512-6R3qpWlezBA9n5unRMvBk7BVjCLETCxEuTEXYtxGRuSqoJKm7jrAVwxVJ/UiJTrz7G/Wuxh20EX+MecgLRqWyQ==
@@ -3969,7 +3969,7 @@
     lodash.merge "^4.6.2"
     vue-lazy-hydration "^2.0.0-beta.4"
 
-"@vue-storefront/nuxt@~2.7.1":
+"@vue-storefront/nuxt@~2.7.5":
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt/-/nuxt-2.7.5.tgz#bb79f17aa8cb7233bf460e827362c16dfc0e3cb3"
   integrity sha512-I0hoxPy5Re2honlvETQsrgSlyy7zdfpOmkqZ/ME6cH4rpfRN317B+5ijqVQzY9j+K64AKyoHqhg0Os0yjypWIA==