From a25daa5d202d6434b65f498746a9483d6ab8a24a Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Thu, 22 Dec 2011 08:32:55 +0000
Subject: [PATCH]  * finish task#658.

---
 module/product/config.php | 1 +
 module/product/model.php  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/product/config.php b/module/product/config.php
index 01a88fea57..11381d8923 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -1,5 +1,6 @@
 <?php
 $config->product->productCounts = 50;
+$config->product->orderBy       = 'code';
 
 global $lang, $app;
 $app->loadLang('story');
diff --git a/module/product/model.php b/module/product/model.php
index 30d86e018b..d758bf78d3 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -167,12 +167,13 @@ class productModel extends model
      */
     public function getPairs($mode = '')
     {
-        $mode .= $this->cookie->productMode;
+        $orderBy  = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'code';
+        $mode    .= $this->cookie->productMode;
         $products = $this->dao->select('*')
             ->from(TABLE_PRODUCT)
             ->where('deleted')->eq(0)
             ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->orderBy('code')
+            ->orderBy($orderBy)
             ->fetchAll();
         $pairs = array();
         foreach($products as $product)