Changed sort options

Author: webdevstar

src/admin/client/modules/settings/general/components/form.js

@@ -184,9 +184,9 @@ class GeneralSettings extends React.Component {
               <div className="col-xs-7">{messages.settings_defaultProductSorting}</div>
               <div className="col-xs-5">
                 <Field component={SelectField} autoWidth={true} fullWidth={true} name="default_product_sorting">
-                  <MenuItem value="price_asc" primaryText={messages.settings_sortByPriceAsc}/>
-                  <MenuItem value="price_desc" primaryText={messages.settings_sortByPriceDesc}/>
-                  <MenuItem value="default" primaryText={messages.settings_sortByDefault}/>
+                  <MenuItem value="stock_status,price" primaryText={messages.settings_sortByPriceAsc}/>
+                  <MenuItem value="stock_status,-price" primaryText={messages.settings_sortByPriceDesc}/>
+                  <MenuItem value="stock_status,price,position" primaryText={messages.settings_sortByDefault}/>
                 </Field>
               </div>
             </div>

src/api/server/services/settings/settings.js

@@ -19,7 +19,7 @@ class SettingsService {
       'default_shipping_country': 'SG',
       'default_shipping_state': '',
       'default_shipping_city': '',
-      'default_product_sorting': 'price_asc',
+      'default_product_sorting': 'stock_status,price,position',
       'weight_unit': 'kg',
       'length_unit': 'cm'
     }

src/store/shared/actions.js

@@ -1,5 +1,6 @@
 import {push} from 'react-router-redux';
 import * as t from './actionTypes'
+import {PAGE, PRODUCT_CATEGORY, PRODUCT, RESERVED} from './pageTypes'
 import clientSettings from '../client/settings'
 import api from 'cezerin-client'
 api.initAjax(clientSettings.ajaxBaseUrl);
@@ -247,15 +248,15 @@ const getCategories = () => {
 }
 
 const getProducts = (currentPage, filter) => {
-  if (currentPage.type === 'product-category') {
+  if (currentPage.type === PRODUCT_CATEGORY) {
     return api.ajax.products.list(filter).then(({status, json}) => json)
   } else {
     return Promise.resolve([]);
   }
 }
 
 const getProduct = currentPage => {
-  if (currentPage.type === 'product') {
+  if (currentPage.type === PRODUCT) {
     return api.ajax.products.retrieve(currentPage.resource).then(({status, json}) => json)
   } else {
     return Promise.resolve();
@@ -267,7 +268,7 @@ const getCart = cookie => {
 }
 
 const getPage = currentPage => {
-  if (currentPage.type === 'page') {
+  if (currentPage.type === PAGE) {
     return api.ajax.pages.retrieve(currentPage.resource).then(pageResponse => {
       return pageResponse.json;
     })
@@ -280,7 +281,7 @@ const getCommonData = (req, currentPage, productsFilter) => {
   const cookie = req.get('cookie');
   return Promise.all([getCategories(), getProduct(currentPage), getProducts(currentPage, productsFilter), getCart(cookie), getPage(currentPage)]).then(([categories, product, products, cart, page]) => {
     let categoryDetails = null;
-    if (currentPage.type === 'product-category') {
+    if (currentPage.type === PRODUCT_CATEGORY) {
       categoryDetails = categories.find(c => c.id === currentPage.resource);
     }
     return {
@@ -327,7 +328,7 @@ export const getInitialState = (req, checkoutFields, currentPage, settings) => {
     }
   }
 
-  if (currentPage.type === 'product-category') {
+  if (currentPage.type === PRODUCT_CATEGORY) {
     initialState.app.productsFilter.category_id = currentPage.resource;
   }
 

src/store/shared/pageTypes.js

@@ -0,0 +1,4 @@
+export const PAGE  = 'page'
+export const PRODUCT_CATEGORY = 'product-category'
+export const PRODUCT  = 'product'
+export const RESERVED  = 'reserved'

src/store/shared/routes.js

@@ -2,6 +2,7 @@ import React from 'react'
 import {Route, IndexRoute} from 'react-router'
 import clientSettings from '../client/settings'
 import {fetchProduct, fetchProducts, fetchPage, setCategory, receiveSitemap} from './actions'
+import {PAGE, PRODUCT_CATEGORY, PRODUCT, RESERVED} from './pageTypes'
 
 import api from 'cezerin-client';
 api.initAjax(clientSettings.ajaxBaseUrl);
@@ -38,18 +39,18 @@ function getComponent(nextState, cb) {
 
   getSitemap(nextState.location.pathname, state, dispatch).then(({currentPage, currentPageAlreadyInState}) => {
     if (currentPage) {
-      if (currentPage.type === 'product-category') {
+      if (currentPage.type === PRODUCT_CATEGORY) {
         dispatch(setCategory(currentPage.resource))
         if(!currentPageAlreadyInState){
           dispatch(fetchProducts());
         }
         cb(null, props => <CategoryContainer {...props}/>);
-      } else if (currentPage.type === 'product') {
+      } else if (currentPage.type === PRODUCT) {
         if(!currentPageAlreadyInState){
           dispatch(fetchProduct(currentPage.resource))
         }
         cb(null, props => <ProductContainer {...props}/>);
-      } else if (currentPage.type === 'page') {
+      } else if (currentPage.type === PAGE) {
         if(!currentPageAlreadyInState){
           dispatch(fetchPage(currentPage.resource))
         }

themes/current/locales/en.json

@@ -20,5 +20,7 @@
   "relatedProducts": "Related products",
   "filterProducts": "Filter products",
   "sort": "Sort",
+  "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/containers/notfound.js

@@ -1,14 +1,15 @@
 import React from 'react'
 import Helmet from 'react-helmet'
+import text from '../lib/text'
 
 const NotFoundContainer = (props) => (
   <div>
-    <Helmet title="Page not found"/>
+    <Helmet title={text.title404}/>
     <section className="section">
       <div className="container">
         <div className="content">
-          <h1>Page not found</h1>
-          The page you requested does not exist. Click here to continue shopping.
+          <h1>{text.title404}</h1>
+          {text.text404}
         </div>
       </div>
     </section>