From 01a1a0e093c6185a667d5c49e19b0cb77d4880b1 Mon Sep 17 00:00:00 2001
From: VicSob <48715911+VicSob@users.noreply.github.com>
Date: Fri, 20 Sep 2019 14:16:08 +0200
Subject: [PATCH 1/3] README Update - partner
New Partner - Kiwi Commerce
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 6cb2d5aa93..de6007c79b 100644
--- a/README.md
+++ b/README.md
@@ -824,10 +824,10 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
-
+
From 10c56371239ce94519d00897aaa53e48f72957c1 Mon Sep 17 00:00:00 2001
From: Niels Gongoll
Date: Thu, 26 Sep 2019 16:26:09 +0200
Subject: [PATCH 2/3] perPage load with value from local.json
---
config/default.json | 3 ++-
core/modules/catalog/store/category/actions.ts | 2 +-
core/pages/Category.js | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/config/default.json b/config/default.json
index a88d04003a..6f603fc9f8 100644
--- a/config/default.json
+++ b/config/default.json
@@ -157,7 +157,8 @@
"excludeFields": [ "sgn" ],
"categoriesRootCategorylId": 2,
"categoriesDynamicPrefetchLevel": 2,
- "categoriesDynamicPrefetch": true
+ "categoriesDynamicPrefetch": true,
+ "perPage": 30
},
"attribute": {
"includeFields": [ "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable", "tier_prices", "frontend_input" ]
diff --git a/core/modules/catalog/store/category/actions.ts b/core/modules/catalog/store/category/actions.ts
index 48c0286ece..4ab007af17 100644
--- a/core/modules/catalog/store/category/actions.ts
+++ b/core/modules/catalog/store/category/actions.ts
@@ -203,7 +203,7 @@ const actions: ActionTree = {
/**
* Filter category products
*/
- products (context, { populateAggregations = false, filters = [], searchProductQuery, current = 0, perPage = 50, sort = '', includeFields = null, excludeFields = null, configuration = null, append = false, skipCache = false, cacheOnly = false }) {
+ products (context, { populateAggregations = false, filters = [], searchProductQuery, current = 0, perPage = config.entities.category.perPage, sort = '', includeFields = null, excludeFields = null, configuration = null, append = false, skipCache = false, cacheOnly = false }) {
context.dispatch('setSearchOptions', {
populateAggregations,
filters,
diff --git a/core/pages/Category.js b/core/pages/Category.js
index 7d01c57e46..09c51e8542 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -19,7 +19,7 @@ export default {
data () {
return {
pagination: {
- perPage: 50,
+ perPage: config.entities.category.perPage,
current: 0,
enabled: false
},
@@ -68,7 +68,7 @@ export default {
store: store,
route: route,
current: 0,
- perPage: 50,
+ perPage: config.entities.category.perPage,
sort,
filters: config.products.defaultFilters,
includeFields: config.entities.optimize && isServer ? config.entities.productList.includeFields : null,
From 42b0a38f5e6dbb99339914d015cb0e23cc1121d0 Mon Sep 17 00:00:00 2001
From: Niels Gongoll
Date: Thu, 26 Sep 2019 16:36:31 +0200
Subject: [PATCH 3/3] changelog update
---
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74194c84c6..16ed18c104 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [Unreleased]
+add perPage load value to category config - @ngongoll (#3630)
+
## [1.10.3] - 2019.09.18
### Fixed
|