Merge pull request #543 from evershopcommerce/dev

Dev
evershopcommerce · May 22, 2024 · 39af72a · 39af72a
2 parents 876b27c + 7272bea
commit 39af72a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/packages/evershop/src/lib/util/defaultPaginationFilters.js b/packages/evershop/src/lib/util/defaultPaginationFilters.js
@@ -81,6 +81,16 @@ const defaultPaginationFilters = [
       const limit = currentFilters.find((f) => f.key === 'limit') || {
         value: CONSTANTS.ADMIN_COLLECTION_SIZE
       };
+      currentFilters.push({
+        key: 'page',
+        operation: 'eq',
+        value: page.value
+      });
+      currentFilters.push({
+        key: 'limit',
+        operation: 'eq',
+        value: limit.value
+      });
       query.limit(
         (parseInt(page.value, 10) - 1) * parseInt(limit.value, 10),
         parseInt(limit.value, 10)

diff --git a/packages/google_login/package.json b/packages/google_login/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evershop/google_login",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A Google authentication extension for EverShop.",
   "repository": {
     "type": "git",

diff --git a/packages/product_review/package.json b/packages/product_review/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evershop/product_review",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "An Evershop extension for product review",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/packages/product_review/services/registerDefaultReviewCollectionFilters.js b/packages/product_review/services/registerDefaultReviewCollectionFilters.js
@@ -46,7 +46,7 @@ module.exports = async function registerDefaultReviewCollectionFilters() {
           {
             product: (query) => query.orderBy('product_description.name'),
             rating: (query) => query.orderBy('product_review.rating'),
-            status: (query) => query.orderBy('product_review.status')
+            status: (query) => query.orderBy('product_review.approved')
           }
         );
 

diff --git a/packages/resend/package.json b/packages/resend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evershop/resend",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A Resend extension for EverShop.",
   "repository": {
     "type": "git",