|
@@ -949,14 +949,19 @@ class OrderController extends O2oBaseController{
|
|
|
}
|
|
|
$criteria = new EMongoCriteria();
|
|
|
|
|
|
- $criteria->booking_time('>=', strtotime($start_time));
|
|
|
- $criteria->booking_time('<', strtotime($end_time));
|
|
|
- $criteria->user('==', new MongoId($user_id));
|
|
|
+ //$criteria->booking_time('>=', strtotime($start_time));
|
|
|
+ //$criteria->booking_time('<', strtotime($end_time));
|
|
|
+ $criteria->addCond('user','==',new MongoId($user_id));
|
|
|
|
|
|
- $orders = ROrder::model()->findAll($criteria);
|
|
|
+ $cursor = ROrder::model()->findAll();
|
|
|
|
|
|
- var_dump($orders);exit;
|
|
|
- return CommonFn::requestAjax(true,$orders);
|
|
|
+ $total = $cursor->count();
|
|
|
+
|
|
|
+ $rows = CommonFn::getRowsFromCursor($cursor);
|
|
|
+
|
|
|
+ $parsedRows = ROrder::model()->parse($rows);
|
|
|
+
|
|
|
+ echo CommonFn::composeDatagridData($parsedRows, $total);
|
|
|
}
|
|
|
|
|
|
}
|