|
@@ -94,6 +94,7 @@ Route::group(['middleware' => 'auth'], function () {
|
|
|
Route::get('/courts', \App\Http\Livewire\Court::class);
|
|
Route::get('/courts', \App\Http\Livewire\Court::class);
|
|
|
Route::get('/motivations', \App\Http\Livewire\Motivation::class);
|
|
Route::get('/motivations', \App\Http\Livewire\Motivation::class);
|
|
|
Route::get('/reports', \App\Http\Livewire\Reports::class);
|
|
Route::get('/reports', \App\Http\Livewire\Reports::class);
|
|
|
|
|
+ Route::get('/members_archive', \App\Http\Livewire\MemberArchive::class);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
Route::get('/receipt/{id}', function ($id) {
|
|
Route::get('/receipt/{id}', function ($id) {
|
|
@@ -178,8 +179,20 @@ Route::get('/get_members', function () {
|
|
|
|
|
|
|
|
$datas = [];
|
|
$datas = [];
|
|
|
|
|
|
|
|
|
|
+ $archived = (isset($_GET['archived']) && $_GET['archived'] == 1) ? true : false;
|
|
|
|
|
+
|
|
|
// $datas = \App\Models\Member::select('members.*')->where('id', '>', 0);
|
|
// $datas = \App\Models\Member::select('members.*')->where('id', '>', 0);
|
|
|
- $x = \App\Models\Member::select('id', 'first_name', 'last_name', 'phone', 'birth_date', 'to_complete', 'current_status', 'certificate', 'certificate_date')->where('id', '>', 0);
|
|
|
|
|
|
|
+ $x = \App\Models\Member::select('id', 'first_name', 'last_name', 'phone', 'birth_date', 'to_complete', 'current_status', 'certificate', 'certificate_date')
|
|
|
|
|
+ ->where('id', '>', 0)
|
|
|
|
|
+ ->where(function($query) use($archived) {
|
|
|
|
|
+ $query->where('is_archived', $archived);
|
|
|
|
|
+ if (!$archived)
|
|
|
|
|
+ $query->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
if (isset($_GET["search"]["value"]) && $_GET["search"]["value"] != "") {
|
|
if (isset($_GET["search"]["value"]) && $_GET["search"]["value"] != "") {
|
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
@@ -286,7 +299,17 @@ Route::get('/get_members', function () {
|
|
|
}
|
|
}
|
|
|
$scadIds = $expiringMemberIds;
|
|
$scadIds = $expiringMemberIds;
|
|
|
} else if ($filterValue == "3") {
|
|
} else if ($filterValue == "3") {
|
|
|
- $scadIds = \App\Models\Member::whereNotIn('id', \App\Models\MemberCertificate::pluck('member_id'))->pluck('id')->toArray();
|
|
|
|
|
|
|
+ $scadIds = \App\Models\Member::whereNotIn('id', \App\Models\MemberCertificate::pluck('member_id'))
|
|
|
|
|
+ ->where(function($query) use($archived) {
|
|
|
|
|
+ $query->where('is_archived', $archived);
|
|
|
|
|
+ if (!$archived)
|
|
|
|
|
+ $query->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->pluck('id')->toArray();
|
|
|
} else if ($filterValue == "4") {
|
|
} else if ($filterValue == "4") {
|
|
|
$memberLatestCerts = DB::table('member_certificates')
|
|
$memberLatestCerts = DB::table('member_certificates')
|
|
|
->select('member_id', DB::raw('MAX(expire_date) as latest_expire_date'))
|
|
->select('member_id', DB::raw('MAX(expire_date) as latest_expire_date'))
|
|
@@ -315,7 +338,19 @@ Route::get('/get_members', function () {
|
|
|
|
|
|
|
|
if ($_GET["filterStatus"] != "null") {
|
|
if ($_GET["filterStatus"] != "null") {
|
|
|
$status = explode(",", $_GET["filterStatus"]);
|
|
$status = explode(",", $_GET["filterStatus"]);
|
|
|
- $members = \App\Models\Member::all();
|
|
|
|
|
|
|
+ // $members = \App\Models\Member::all();
|
|
|
|
|
+ // Only get non-archived members for status filtering
|
|
|
|
|
+ $members = \App\Models\Member::where(function($query) use($archived) {
|
|
|
|
|
+ $query->where(function($q) use($archived) {
|
|
|
|
|
+ $q->where('is_archived', $archived);
|
|
|
|
|
+ if (!$archived)
|
|
|
|
|
+ $q->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($q) {
|
|
|
|
|
+ $q->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ });
|
|
|
|
|
+ })->get();
|
|
|
foreach ($status as $s) {
|
|
foreach ($status as $s) {
|
|
|
foreach ($members as $m) {
|
|
foreach ($members as $m) {
|
|
|
$state = $m->getStatus();
|
|
$state = $m->getStatus();
|
|
@@ -603,7 +638,15 @@ Route::get('/get_record_in', function () {
|
|
|
$excludeCausals[] = $e->id;
|
|
$excludeCausals[] = $e->id;
|
|
|
}*/
|
|
}*/
|
|
|
|
|
|
|
|
- $exclude_from_records = \App\Models\Member::where('exclude_from_records', true)->pluck('id')->toArray();
|
|
|
|
|
|
|
+ $exclude_from_records = \App\Models\Member::where('exclude_from_records', true)
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id')->toArray();
|
|
|
|
|
|
|
|
// Pagamento money
|
|
// Pagamento money
|
|
|
$moneys = \App\Models\PaymentMethod::where('money', true)->pluck('id')->toArray();
|
|
$moneys = \App\Models\PaymentMethod::where('money', true)->pluck('id')->toArray();
|
|
@@ -831,9 +874,17 @@ Route::get('/get_course_list', function () {
|
|
|
if ($_GET["search"]["value"] != '') {
|
|
if ($_GET["search"]["value"] != '') {
|
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
|
- $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
|
|
|
|
|
- ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
|
|
|
|
|
- })->pluck('id');
|
|
|
|
|
|
|
+ $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
|
|
|
|
|
+ ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
/*
|
|
/*
|
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
@@ -1206,9 +1257,17 @@ Route::get('/get_course_members', function () {
|
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
|
|
|
|
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
|
- $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
|
|
|
|
|
- ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
|
|
|
|
|
- })->pluck('id');
|
|
|
|
|
|
|
+ $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
|
|
|
|
|
+ ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
|
|
|
|
|
/*$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
/*$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
|
$query->where('first_name', 'like', '%' . $v . '%')
|
|
$query->where('first_name', 'like', '%' . $v . '%')
|
|
@@ -1322,6 +1381,14 @@ Route::get('/get_course_members', function () {
|
|
|
$allScadIds = array_merge($allScadIds, $expiringMemberIds);
|
|
$allScadIds = array_merge($allScadIds, $expiringMemberIds);
|
|
|
} else if ($filterValue == "3") {
|
|
} else if ($filterValue == "3") {
|
|
|
$scadIds = \App\Models\Member::whereNotIn('id', \App\Models\MemberCertificate::pluck('member_id'))
|
|
$scadIds = \App\Models\Member::whereNotIn('id', \App\Models\MemberCertificate::pluck('member_id'))
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })
|
|
|
->pluck('id')
|
|
->pluck('id')
|
|
|
->toArray();
|
|
->toArray();
|
|
|
$allScadIds = array_merge($allScadIds, $scadIds);
|
|
$allScadIds = array_merge($allScadIds, $scadIds);
|
|
@@ -1353,21 +1420,53 @@ Route::get('/get_course_members', function () {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ($_GET["fromYear"] != "") {
|
|
if ($_GET["fromYear"] != "") {
|
|
|
- $m_ids = \App\Models\Member::where('birth_date', '<', date("Y-m-d", strtotime("-" . $_GET["fromYear"] . " year", time())))->pluck('id');
|
|
|
|
|
|
|
+ $m_ids = \App\Models\Member::where('birth_date', '<', date("Y-m-d", strtotime("-" . $_GET["fromYear"] . " year", time())))
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ($_GET["toYear"] != "") {
|
|
if ($_GET["toYear"] != "") {
|
|
|
- $m_ids = \App\Models\Member::where('birth_date', '>', date("Y-m-d", strtotime("-" . $_GET["toYear"] . " year", time())))->pluck('id');
|
|
|
|
|
|
|
+ $m_ids = \App\Models\Member::where('birth_date', '>', date("Y-m-d", strtotime("-" . $_GET["toYear"] . " year", time())))
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ($_GET["fromFromYear"] != "") {
|
|
if ($_GET["fromFromYear"] != "") {
|
|
|
- $m_ids = \App\Models\Member::whereYear('birth_date', '>=', $_GET["fromFromYear"])->pluck('id');
|
|
|
|
|
|
|
+ $m_ids = \App\Models\Member::whereYear('birth_date', '>=', $_GET["fromFromYear"])
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
|
}
|
|
}
|
|
|
if ($_GET["toToYear"] != "") {
|
|
if ($_GET["toToYear"] != "") {
|
|
|
- $m_ids = \App\Models\Member::whereYear('birth_date', '<=', $_GET["toToYear"])->pluck('id');
|
|
|
|
|
|
|
+ $m_ids = \App\Models\Member::whereYear('birth_date', '<=', $_GET["toToYear"])
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
$datas = $datas->whereIn('member_id', $m_ids);
|
|
|
}
|
|
}
|
|
|
if ($_GET["filterCards"] != "null") {
|
|
if ($_GET["filterCards"] != "null") {
|
|
@@ -1490,9 +1589,17 @@ Route::get('/get_receipts', function () {
|
|
|
if (isset($_GET["search"]["value"]) && !empty($_GET["search"]["value"])) {
|
|
if (isset($_GET["search"]["value"]) && !empty($_GET["search"]["value"])) {
|
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
|
- $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
|
|
|
|
|
- ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
|
|
|
|
|
- })->pluck('id');
|
|
|
|
|
|
|
+ $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
|
|
|
|
|
+ ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_archived', false)
|
|
|
|
|
+ ->orWhereNull('is_archived');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where(function($query) {
|
|
|
|
|
+ $query->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ })->pluck('id');
|
|
|
$baseQuery = $baseQuery->whereIn('receipts.member_id', $member_ids);
|
|
$baseQuery = $baseQuery->whereIn('receipts.member_id', $member_ids);
|
|
|
}
|
|
}
|
|
|
|
|
|