Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Sale.php

@@ -2947,6 +2947,7 @@ class Sale extends Base
             $order["brand_name"]="";
             $order["brand_id"]="";
         }
+        $order['specinfo']=json_decode($order['specinfo'],true);
         $order['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $order['cat_info'] = made($order['cat_id'],[]);
         $order['noble_name']=isset($order['noble_metal'])&&$order['noble_metal']!=0?$this->noble[$order['noble_metal']] :"";