merge

www/protected/modules/o2o/models/ROrder.php

@@ -183,7 +183,9 @@ class ROrder extends MongoAr
                 $temp_info = $product_obj->parseRow($product_obj);
                 //echo(json_encode($temp_info));exit;
                 $temp_info['count'] = $product['count'];
-                $products[] = $temp_info;
+                //$temp_info['extra'] = $product['extra'];
+                $products[] = array('product'=>$temp_info,'extra'=>$product['extra']);
+                //$temp_info['extra'] = $product['extra'];
                 if($key == 0){
                     $newRow['products_str'] .= $temp_info['name'];
                 }else{

www/protected/views/rOrder/index.php

@@ -1013,22 +1013,22 @@
             for(var j in products){
                 if(j == products.length-1){
                     if(products[j].count>1){
-                        product_info += products[j].name+"x"+products[j].count;
+                        product_info += products[j]['product'].name+"x"+products[j]['product'].count;
                     }else{
-                        product_info += products[j].name;
+                        product_info += products[j]['product'].name;
                     }
-                    if(!$.isEmptyObject(products[j].extra)){
-                        product_info += '('+products[j].extra[0].type+'--'+products[j].extra[0].price+')';
+                    if(!$.isEmptyObject(products[j]['extra'])){
+                        product_info += '('+products[j]['extra'].type+'--'+products[j]['extra'].price+')';
                     }
 
                 }else{
                     if(products[j].count>1) {
-                        product_info += products[j].name + "x" + products[j].count + " + ";
+                        product_info += products[j]['product'].name + "x" + products[j]['product'].count + " + ";
                     }else{
-                        product_info += products[j].name + " + ";
+                        product_info += products[j]['product'].name + " + ";
                     }
                     if(!$.isEmptyObject(products[j].extra)){
-                        product_info += '('+products[j].extra[0].type+'--'+products[j].extra[0].price+')';
+                        product_info += '('+products[j]['extra'].type+'--'+products[j]['extra'].price+')';
                     }
                 }
             }