diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index e4614e8..4cd5272 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -332,6 +332,7 @@ class OrdersController extends CommonController ->select("area.id", "area.name", "area.building_id") ->leftJoin("building", "building.id", "=", "area.building_id") ->addSelect("building.name as building_name") + ->orderBy("building_name") ->orderBy("area.myindex") ->orderBy("area.name") ->get(); diff --git a/app/Http/Controllers/Manager/StatisticsController.php b/app/Http/Controllers/Manager/StatisticsController.php index ed5d104..3731ed3 100644 --- a/app/Http/Controllers/Manager/StatisticsController.php +++ b/app/Http/Controllers/Manager/StatisticsController.php @@ -217,6 +217,12 @@ class StatisticsController extends CommonController $query->where("project_id", $request->project_id); })->whereNotNull("paid_at")->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}"); + if (!$request->show_all) { + $manager = $this->manager; + $model_recharge = $model_recharge->where("manager_id", $manager->id); + $model_refund = $model_refund->where("manager_id", $manager->id); + } + $page_size = $request->has("page_size") ? (int)$request->page_size : 10; switch ($request->detail_type) { case "checkout":