hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 14:56:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#2480 Sales Reports

Browse Source
This commit is contained in:
diashalabi 2021-10-01 16:12:39 +03:00
parent abe3218fea
commit 3d56766796
2 changed files with 55 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/default/visiosoft/profile-module/resources/assets/js/admin/dashboard/report.js
View File

@ -1,7 +1,16 @@
$(document).ready( function () { $(document).ready( function () {
$('#newMemberReport').DataTable({ $('#newMemberReport').DataTable({
ajax: '/admin/api/profile/report/latest', ajax: {
order: [[ 1, "desc" ]], url: '/admin/api/profile/report/latest',
dataSrc( json ) {
json.recordsTotal = json.total;
json.recordsFiltered = json.total;
return json.data;
}
},
processing: true,
serverSide: true,
columns: [ columns: [
{ data: 'member', defaultContent: usersReportTrans.undefined_member }, { data: 'member', defaultContent: usersReportTrans.undefined_member },
{ data: 'date' }, { data: 'date' },
@ -9,8 +18,17 @@ $(document).ready( function () {
}); });
$('#loginMemberReport').DataTable({ $('#loginMemberReport').DataTable({
ajax: '/admin/api/profile/report/login', ajax: {
order: [[ 1, "desc" ]], url: '/admin/api/profile/report/login',
dataSrc( json ) {
json.recordsTotal = json.total;
json.recordsFiltered = json.total;
return json.data;
}
},
processing: true,
serverSide: true,
columns: [ columns: [
{ data: 'member', defaultContent: usersReportTrans.undefined_member }, { data: 'member', defaultContent: usersReportTrans.undefined_member },
{ data: 'date' }, { data: 'date' },

44
addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ReportController.php
View File

@ -17,13 +17,24 @@ class ReportController extends AdminController
public function latest() public function latest()
{ {
$members = $this->userRepository->newQuery() $members = $this->userRepository->newQuery()
->selectRaw("DATE_FORMAT(created_at, '%d.%m.%Y %H:%i') as date, CONCAT_WS('', first_name, ' ', last_name) AS member") ->selectRaw("DATE_FORMAT(created_at, '%d.%m.%Y %H:%i') as date, CONCAT_WS('', first_name, ' ', last_name) AS member, id AS user_id")
->where('created_at', '>=', Carbon::today()->subWeek()) ->where('created_at', '>=', Carbon::today()->subWeek());
->get();
return [ if ($search = request('search.value')) {
'data' => $members $members = $members->whereRaw("
]; (SELECT CONCAT_WS('', first_name, ' ', last_name) AS member) LIKE '%$search%'
");
}
if ($orderDir = request('order.0.dir')) {
$members = $members->orderBy('member', $orderDir);
}
$start = request('start');
$limit = request('length') ?: 10;
$page = $start ? $start / $limit + 1 : 1;
return $members->paginate($limit, ['*'], 'page', $page);
} }
public function login() public function login()
@ -31,11 +42,22 @@ class ReportController extends AdminController
$members = $this->userRepository->newQuery() $members = $this->userRepository->newQuery()
->selectRaw("DATE_FORMAT(last_login_at, '%d.%m.%Y %H:%i') as date, CONCAT_WS('', first_name, ' ', last_name) AS member") ->selectRaw("DATE_FORMAT(last_login_at, '%d.%m.%Y %H:%i') as date, CONCAT_WS('', first_name, ' ', last_name) AS member")
->whereNotNull('last_login_at') ->whereNotNull('last_login_at')
->where('last_login_at', '>=', Carbon::today()->subWeek()) ->where('last_login_at', '>=', Carbon::today()->subWeek());
->get();
return [ if ($search = request('search.value')) {
'data' => $members $members = $members->whereRaw("
]; (SELECT CONCAT_WS('', first_name, ' ', last_name) AS member) LIKE '%$search%'
");
}
if ($orderDir = request('order.0.dir')) {
$members = $members->orderBy('member', $orderDir);
}
$start = request('start');
$limit = request('length') ?: 10;
$page = $start ? $start / $limit + 1 : 1;
return $members->paginate($limit, ['*'], 'page', $page);
} }
} }