Added total_count to response

Author: webdevstar

src/api/server/services/products/products.js

@@ -38,8 +38,24 @@ class ProductsService {
         aggregationPipeline.push({ $skip : offset });
         aggregationPipeline.push({ $limit : limit });
 
+        // get total records count
+        const aggregationCount = [];
+        if(matchTextQuery) {
+          aggregationCount.push({ $match: matchTextQuery });
+        }
+        aggregationCount.push({ $match: matchQuery });
+        aggregationCount.push({$group: {_id: null, count: { $sum: 1 }}});
+
         return mongo.db.collection('products').aggregate(aggregationPipeline).toArray()
-          .then(items => items.map(item => this.changeProperties(categories, item, thumbnail_width)))
+          .then(items => items.map(item => this.changeProperties(categories, item, thumbnail_width))).then(items => {
+            return mongo.db.collection('products').aggregate(aggregationCount).toArray().then(countItems => {
+              return {
+                total_count: countItems[0].count,
+                has_more: (offset + items.length) < countItems[0].count,
+                data: items
+              }
+            })
+          })
       });
   }
 
@@ -299,7 +315,7 @@ class ProductsService {
       return Promise.reject('Invalid identifier');
     }
     return this.getProducts({ ids: id, limit: 1})
-    .then(items => items.length > 0 ? items[0] : {})
+    .then(products => products.data.length > 0 ? products.data[0] : {})
   }
 
   addProduct(data) {

src/store/shared/actions.js

@@ -319,7 +319,7 @@ export const getInitialState = (req, checkoutFields, currentPage, settings) => {
         price_from: null,
         price_to: null,
         limit: 30,
-        sort: 'price,stock_status',
+        sort: settings.default_product_sorting,
         fields: 'path,id,name,category_id,category_name,sku,images,enabled,discontinued,stock_status,stock_quantity,price,on_sale,regular_price'
       },
       cart: null,

themes/current/config.json

@@ -6,5 +6,8 @@
   "big_thumbnail_width": 800,
   "checkout_input_class": "checkout-field",
   "checkout_button_class": "checkout-button button is-primary",
-  "imagePlaceholder": "/assets/images/placeholder.svg"
+  "imagePlaceholder": "/assets/images/placeholder.svg",
+  "sort_newest": "-date_created",
+  "sort_price_low": "price",
+  "sort_price_high": "-price"
 }

themes/current/locales/en.json

@@ -20,6 +20,10 @@
   "relatedProducts": "Related products",
   "filterProducts": "Filter products",
   "sort": "Sort",
+  "sortFavorite":"Favorite",
+  "sortNewest":"Newest",
+  "sortPriceLow":"Price low to high",
+  "sortPriceHigh":"Price high to low",
   "title404": "Page not found",
   "text404": "The page you requested does not exist. Click here to continue shopping.",
   "footerCopyright": "Copyright © 2017 Demo Drone Store. All Rights Reserved. EN. "

themes/current/src/components/productsSort.js

@@ -1,14 +1,18 @@
 import React from 'react'
 import text from '../lib/text'
+import config from '../lib/config'
 
 const Sort = ({ defaultSort, currentSort, setSort }) => {
   return (
     <div className="columns">
       <div className="column is-3">{text.sort}:</div>
       <div className="column">
       <span className="select is-fullwidth">
-        <select>
-          <option>Not implemented</option>
+        <select onChange={e => {setSort(e.target.value)}} value={currentSort}>
+          <option value={defaultSort}>{text.sortFavorite}</option>
+          <option value={config.sort_newest}>{text.sortNewest}</option>
+          <option value={config.sort_price_low}>{text.sortPriceLow}</option>
+          <option value={config.sort_price_high}>{text.sortPriceHigh}</option>
         </select>
       </span>
       </div>

themes/current/src/containers/category.js

@@ -7,7 +7,7 @@ import ProductsSort from '../components/productsSort'
 import Waypoint from 'react-waypoint'
 
 const CategoryContainer = (props) => {
-  const {products, categoryDetails, settings} = props.state;
+  const {products, categoryDetails, settings, productsFilter} = props.state;
 
   return (
     <div>
@@ -48,7 +48,7 @@ const CategoryContainer = (props) => {
                 <div className="columns">
                   <div className="column"></div>
                   <div className="column is-4">
-                    <ProductsSort />
+                    <ProductsSort defaultSort={settings.default_product_sorting} currentSort={productsFilter.sort} setSort={props.setSort} />
                   </div>
                 </div>
               </MediaQuery>