|
@@ -33,13 +33,11 @@ Route::get('/login', function () {
|
|
|
|
|
|
|
|
Route::post('/login', function () {
|
|
Route::post('/login', function () {
|
|
|
|
|
|
|
|
- if(Auth::attempt(array('email' => $_POST["email"], 'password' => $_POST["password"])))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (Auth::attempt(array('email' => $_POST["email"], 'password' => $_POST["password"]))) {
|
|
|
if (Auth::user()->level == ENV('INSTRUCTOR_LEVEL', 2))
|
|
if (Auth::user()->level == ENV('INSTRUCTOR_LEVEL', 2))
|
|
|
return Redirect::to('/calendar');
|
|
return Redirect::to('/calendar');
|
|
|
else
|
|
else
|
|
|
return Redirect::to('/dashboard');
|
|
return Redirect::to('/dashboard');
|
|
|
-
|
|
|
|
|
} else {
|
|
} else {
|
|
|
return Redirect::to('/?error=1');
|
|
return Redirect::to('/?error=1');
|
|
|
}
|
|
}
|
|
@@ -97,6 +95,7 @@ Route::group(['middleware' => 'auth'], function () {
|
|
|
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('/members_archive', \App\Http\Livewire\MemberArchive::class);
|
|
|
|
|
+ Route::get('/financial_movements', \App\Http\Livewire\FinancialMovements::class);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
Route::get('/receipt/{id}', function ($id) {
|
|
Route::get('/receipt/{id}', function ($id) {
|
|
@@ -186,12 +185,12 @@ Route::get('/get_members', function () {
|
|
|
// $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')
|
|
$x = \App\Models\Member::select('id', 'first_name', 'last_name', 'phone', 'birth_date', 'to_complete', 'current_status', 'certificate', 'certificate_date')
|
|
|
->where('id', '>', 0)
|
|
->where('id', '>', 0)
|
|
|
- ->where(function($query) use($archived) {
|
|
|
|
|
|
|
+ ->where(function ($query) use ($archived) {
|
|
|
$query->where('is_archived', $archived);
|
|
$query->where('is_archived', $archived);
|
|
|
if (!$archived)
|
|
if (!$archived)
|
|
|
$query->orWhereNull('is_archived');
|
|
$query->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
});
|
|
});
|
|
@@ -302,12 +301,12 @@ 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'))
|
|
$scadIds = \App\Models\Member::whereNotIn('id', \App\Models\MemberCertificate::pluck('member_id'))
|
|
|
- ->where(function($query) use($archived) {
|
|
|
|
|
|
|
+ ->where(function ($query) use ($archived) {
|
|
|
$query->where('is_archived', $archived);
|
|
$query->where('is_archived', $archived);
|
|
|
if (!$archived)
|
|
if (!$archived)
|
|
|
$query->orWhereNull('is_archived');
|
|
$query->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})
|
|
})
|
|
@@ -342,16 +341,16 @@ Route::get('/get_members', function () {
|
|
|
$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
|
|
// Only get non-archived members for status filtering
|
|
|
- $members = \App\Models\Member::where(function($query) use($archived) {
|
|
|
|
|
- $query->where(function($q) use($archived) {
|
|
|
|
|
|
|
+ $members = \App\Models\Member::where(function ($query) use ($archived) {
|
|
|
|
|
+ $query->where(function ($q) use ($archived) {
|
|
|
$q->where('is_archived', $archived);
|
|
$q->where('is_archived', $archived);
|
|
|
if (!$archived)
|
|
if (!$archived)
|
|
|
$q->orWhereNull('is_archived');
|
|
$q->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($q) {
|
|
|
|
|
- $q->where('is_deleted', false)
|
|
|
|
|
- ->orWhereNull('is_deleted');
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ ->where(function ($q) {
|
|
|
|
|
+ $q->where('is_deleted', false)
|
|
|
|
|
+ ->orWhereNull('is_deleted');
|
|
|
|
|
+ });
|
|
|
})->get();
|
|
})->get();
|
|
|
foreach ($status as $s) {
|
|
foreach ($status as $s) {
|
|
|
foreach ($members as $m) {
|
|
foreach ($members as $m) {
|
|
@@ -516,13 +515,13 @@ Route::get('/get_record_in', function () {
|
|
|
->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
|
->where('records.type', 'IN');
|
|
->where('records.type', 'IN');
|
|
|
|
|
|
|
|
- $x = \App\Models\Record::select('records.*', DB::raw('members.first_name as first_name'), DB::raw('members.last_name as last_name'), DB::raw('payment_methods.name as payment'), DB::raw('receipts.created_at as receipt_date')) // , \DB::raw('SUM(records.id) As total'))
|
|
|
|
|
- ->leftJoin('members', 'records.member_id', '=', 'members.id')
|
|
|
|
|
- ->leftJoin('payment_methods', 'records.payment_method_id', '=', 'payment_methods.id')
|
|
|
|
|
- ->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
|
|
|
- ->where('records.type', 'IN');
|
|
|
|
|
|
|
+ $x = \App\Models\Record::select('records.*', DB::raw('members.first_name as first_name'), DB::raw('members.last_name as last_name'), DB::raw('payment_methods.name as payment'), DB::raw('receipts.created_at as receipt_date')) // , \DB::raw('SUM(records.id) As total'))
|
|
|
|
|
+ ->leftJoin('members', 'records.member_id', '=', 'members.id')
|
|
|
|
|
+ ->leftJoin('payment_methods', 'records.payment_method_id', '=', 'payment_methods.id')
|
|
|
|
|
+ ->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
|
|
|
+ ->where('records.type', 'IN');
|
|
|
|
|
|
|
|
- $y = \App\Models\Record::select('records_rows.record_id', 'records_rows.amount', 'records.member_id', 'records.corrispettivo_fiscale', 'records.commercial', 'records.deleted', 'records.financial_movement', 'records_rows.causal_id', 'records.payment_method_id', DB::raw('members.first_name as first_name'), DB::raw('members.last_name as last_name')) // , \DB::raw('SUM(records.id) As total'))
|
|
|
|
|
|
|
+ $y = \App\Models\Record::select('records_rows.record_id', 'records_rows.amount', 'records.member_id', 'records.corrispettivo_fiscale', 'records.commercial', 'records.deleted', 'records.financial_movement', 'records_rows.causal_id', 'records.payment_method_id', DB::raw('members.first_name as first_name'), DB::raw('members.last_name as last_name')) // , \DB::raw('SUM(records.id) As total'))
|
|
|
->leftJoin('members', 'records.member_id', '=', 'members.id')
|
|
->leftJoin('members', 'records.member_id', '=', 'members.id')
|
|
|
->leftJoin('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
->leftJoin('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
//->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
//->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
@@ -633,8 +632,8 @@ Route::get('/get_record_in', function () {
|
|
|
if ($borsellino)
|
|
if ($borsellino)
|
|
|
$excludeCausals[] = $borsellino->id;*/
|
|
$excludeCausals[] = $borsellino->id;*/
|
|
|
|
|
|
|
|
- // Aggiungo
|
|
|
|
|
- /*
|
|
|
|
|
|
|
+ // Aggiungo
|
|
|
|
|
+ /*
|
|
|
$excludes = \App\Models\Causal::where('no_records', true)->get();
|
|
$excludes = \App\Models\Causal::where('no_records', true)->get();
|
|
|
foreach($excludes as $e)
|
|
foreach($excludes as $e)
|
|
|
{
|
|
{
|
|
@@ -642,11 +641,11 @@ Route::get('/get_record_in', function () {
|
|
|
}*/
|
|
}*/
|
|
|
|
|
|
|
|
$exclude_from_records = \App\Models\Member::where('exclude_from_records', true)
|
|
$exclude_from_records = \App\Models\Member::where('exclude_from_records', true)
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_archived', false)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id')->toArray();
|
|
})->pluck('id')->toArray();
|
|
@@ -669,26 +668,26 @@ Route::get('/get_record_in', function () {
|
|
|
foreach ($y->get() as $r) {
|
|
foreach ($y->get() as $r) {
|
|
|
|
|
|
|
|
if (!in_array($r->payment_method_id, $moneys)) {
|
|
if (!in_array($r->payment_method_id, $moneys)) {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (
|
|
if (
|
|
|
- (!in_array($r->member_id, $exclude_from_records) || in_array($r->causal_id, $moneysCausal))
|
|
|
|
|
- &&
|
|
|
|
|
- (!$r->deleted || $r->deleted == null)
|
|
|
|
|
- &&
|
|
|
|
|
- (!in_array($r->causal_id, $excludeCausals) || in_array($r->causal_id, $moneysCausal))
|
|
|
|
|
- &&
|
|
|
|
|
- (!$r->financial_movement || $r->financial_movement == null)
|
|
|
|
|
- &&
|
|
|
|
|
- (!$r->corrispettivo_fiscale || $r->corrispettivo_fiscale == null)
|
|
|
|
|
- ) {
|
|
|
|
|
- // if (sizeof($causals) == 0 || in_array($r->causal_id, $causals)) {
|
|
|
|
|
- $total += $r->amount;
|
|
|
|
|
- if ($r->vat_id > 0)
|
|
|
|
|
- $total += getVatValue($r->amount, $r->vat_id);
|
|
|
|
|
-
|
|
|
|
|
- //$aIds[] = array('id' => $r->record_id, 'amount' => $r->amount);
|
|
|
|
|
- $aIds[] = $r->record_id;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ (!in_array($r->member_id, $exclude_from_records) || in_array($r->causal_id, $moneysCausal))
|
|
|
|
|
+ &&
|
|
|
|
|
+ (!$r->deleted || $r->deleted == null)
|
|
|
|
|
+ &&
|
|
|
|
|
+ (!in_array($r->causal_id, $excludeCausals) || in_array($r->causal_id, $moneysCausal))
|
|
|
|
|
+ &&
|
|
|
|
|
+ (!$r->financial_movement || $r->financial_movement == null)
|
|
|
|
|
+ &&
|
|
|
|
|
+ (!$r->corrispettivo_fiscale || $r->corrispettivo_fiscale == null)
|
|
|
|
|
+ ) {
|
|
|
|
|
+ // if (sizeof($causals) == 0 || in_array($r->causal_id, $causals)) {
|
|
|
|
|
+ $total += $r->amount;
|
|
|
|
|
+ if ($r->vat_id > 0)
|
|
|
|
|
+ $total += getVatValue($r->amount, $r->vat_id);
|
|
|
|
|
+
|
|
|
|
|
+ //$aIds[] = array('id' => $r->record_id, 'amount' => $r->amount);
|
|
|
|
|
+ $aIds[] = $r->record_id;
|
|
|
|
|
+ // }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -696,7 +695,7 @@ Route::get('/get_record_in', function () {
|
|
|
}
|
|
}
|
|
|
//print $count;
|
|
//print $count;
|
|
|
//print implode(",",$aIds);
|
|
//print implode(",",$aIds);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
$count = $x->count();
|
|
$count = $x->count();
|
|
|
|
|
|
|
|
if (isset($_GET["order"])) {
|
|
if (isset($_GET["order"])) {
|
|
@@ -868,6 +867,105 @@ Route::get('/get_record_out', function () {
|
|
|
return json_encode(array("data" => $datas));
|
|
return json_encode(array("data" => $datas));
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+Route::get('/get_financial_movements', function () {
|
|
|
|
|
+ $filterFrom = request('filterFrom');
|
|
|
|
|
+ $filterTo = request('filterTo');
|
|
|
|
|
+ $filterOrigins = request('filterOrigins');
|
|
|
|
|
+ $filterDestinations = request('filterDestinations');
|
|
|
|
|
+
|
|
|
|
|
+ $base = \App\Models\FinancialMovement::query()
|
|
|
|
|
+ ->leftJoin('banks as origins', 'origins.id', '=', 'financial_movements.origin_id')
|
|
|
|
|
+ ->leftJoin('banks as destinations', 'destinations.id', '=', 'financial_movements.destination_id')
|
|
|
|
|
+ ->leftJoin('causals as causals', 'causals.id', '=', 'financial_movements.causal_id')
|
|
|
|
|
+ ->where('financial_movements.deleted', false);
|
|
|
|
|
+
|
|
|
|
|
+ if (!empty($filterFrom)) {
|
|
|
|
|
+ $base->whereDate('financial_movements.date', '>=', $filterFrom);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (!empty($filterTo)) {
|
|
|
|
|
+ $base->whereDate('financial_movements.date', '<=', $filterTo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if ($filterOrigins && $filterOrigins !== "null") {
|
|
|
|
|
+ $origins = array_filter(explode(",", $filterOrigins));
|
|
|
|
|
+ if (!empty($origins)) {
|
|
|
|
|
+ $base->whereIn('financial_movements.origin_id', $origins);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if ($filterDestinations && $filterDestinations !== "null") {
|
|
|
|
|
+ $destinations = array_filter(explode(",", $filterDestinations));
|
|
|
|
|
+ if (!empty($destinations)) {
|
|
|
|
|
+ $base->whereIn('financial_movements.destination_id', $destinations);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $recordsFiltered = (clone $base)->count();
|
|
|
|
|
+
|
|
|
|
|
+ $recordsTotal = \App\Models\FinancialMovement::where('deleted', false)->count();
|
|
|
|
|
+
|
|
|
|
|
+ $totalAmount = (clone $base)->sum('financial_movements.amount');
|
|
|
|
|
+
|
|
|
|
|
+ $start = (int) request('start', 0);
|
|
|
|
|
+ $limit = (int) request('length', 100000);
|
|
|
|
|
+
|
|
|
|
|
+ $order = request('order');
|
|
|
|
|
+ if ($order) {
|
|
|
|
|
+ $colIdx = (int) ($order[0]['column'] ?? 0);
|
|
|
|
|
+ $dir = ($order[0]['dir'] ?? 'desc') === 'asc' ? 'asc' : 'desc';
|
|
|
|
|
+
|
|
|
|
|
+ $column = match ($colIdx) {
|
|
|
|
|
+ 0 => 'financial_movements.date',
|
|
|
|
|
+ 1 => 'financial_movements.amount',
|
|
|
|
|
+ 2 => 'origins.name',
|
|
|
|
|
+ 3 => 'destinations.name',
|
|
|
|
|
+ default => 'financial_movements.id',
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ $base->orderBy($column, $dir)->orderBy('financial_movements.id', 'DESC');
|
|
|
|
|
+ } else {
|
|
|
|
|
+ $base->orderBy('financial_movements.date', 'DESC')->orderBy('financial_movements.id', 'DESC');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $rows = $base
|
|
|
|
|
+ ->select([
|
|
|
|
|
+ 'financial_movements.id',
|
|
|
|
|
+ 'financial_movements.date',
|
|
|
|
|
+ 'financial_movements.amount',
|
|
|
|
|
+ 'financial_movements.deleted',
|
|
|
|
|
+ 'origins.name as origin_name',
|
|
|
|
|
+ 'destinations.name as destination_name',
|
|
|
|
|
+ 'causals.name as causal_name',
|
|
|
|
|
+ ])
|
|
|
|
|
+ ->offset($start)
|
|
|
|
|
+ ->limit($limit)
|
|
|
|
|
+ ->get();
|
|
|
|
|
+
|
|
|
|
|
+ $data = [];
|
|
|
|
|
+ foreach ($rows as $r) {
|
|
|
|
|
+ $data[] = [
|
|
|
|
|
+ 'id' => $r->id,
|
|
|
|
|
+ 'date' => $r->date,
|
|
|
|
|
+ 'origin' => $r->origin_name ?? '',
|
|
|
|
|
+ 'destination' => $r->destination_name ?? '',
|
|
|
|
|
+ 'total' => formatPrice($r->amount),
|
|
|
|
|
+ 'causal' => $r->causal_name ?? '',
|
|
|
|
|
+ 'action' => $r->id . "|0|" . ($r->deleted ? 'x' : '')
|
|
|
|
|
+ ];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $draw = (int) request('draw', 0);
|
|
|
|
|
+
|
|
|
|
|
+ return response()->json([
|
|
|
|
|
+ "draw" => $draw,
|
|
|
|
|
+ "data" => $data,
|
|
|
|
|
+ "recordsTotal" => $recordsTotal,
|
|
|
|
|
+ "recordsFiltered" => $recordsFiltered,
|
|
|
|
|
+ "totals" => formatPrice($totalAmount),
|
|
|
|
|
+ ]);
|
|
|
|
|
+});
|
|
|
|
|
+
|
|
|
Route::get('/get_course_list', function () {
|
|
Route::get('/get_course_list', function () {
|
|
|
|
|
|
|
|
$member_course = \App\Models\MemberCourse::with('member')->with('course');
|
|
$member_course = \App\Models\MemberCourse::with('member')->with('course');
|
|
@@ -877,14 +975,14 @@ 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 . "%'");
|
|
|
|
|
- })
|
|
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ $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)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1252,7 +1350,7 @@ Route::get('/get_course_members', function () {
|
|
|
|
|
|
|
|
//$datas = \App\Models\MemberCourse::with('member');
|
|
//$datas = \App\Models\MemberCourse::with('member');
|
|
|
|
|
|
|
|
- $datas = \App\Models\MemberCourse::select('member_courses.*', 'courses.name as course_name', 'members.first_name', 'members.last_name', 'members.email', 'members.phone', 'members.birth_date','members.gender')
|
|
|
|
|
|
|
+ $datas = \App\Models\MemberCourse::select('member_courses.*', 'courses.name as course_name', 'members.first_name', 'members.last_name', 'members.email', 'members.phone', 'members.birth_date', 'members.gender')
|
|
|
->leftJoin('courses', 'member_courses.course_id', '=', 'courses.id')
|
|
->leftJoin('courses', 'member_courses.course_id', '=', 'courses.id')
|
|
|
->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
|
|
->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
|
|
|
|
|
|
|
@@ -1260,14 +1358,14 @@ 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 . "%'");
|
|
|
|
|
- })
|
|
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ $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)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1279,8 +1377,7 @@ Route::get('/get_course_members', function () {
|
|
|
$datas = $datas->whereIn('member_id', $member_ids);
|
|
$datas = $datas->whereIn('member_id', $member_ids);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (isset($_GET["filterFromPrevious"]) && $_GET["filterFromPrevious"] != "")
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (isset($_GET["filterFromPrevious"]) && $_GET["filterFromPrevious"] != "") {
|
|
|
$datas = $datas->whereIn('course_id', [$_GET["filterFromPrevious"]]);
|
|
$datas = $datas->whereIn('course_id', [$_GET["filterFromPrevious"]]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1384,11 +1481,11 @@ 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) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_archived', false)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})
|
|
})
|
|
@@ -1424,11 +1521,11 @@ 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())))
|
|
$m_ids = \App\Models\Member::where('birth_date', '<', date("Y-m-d", strtotime("-" . $_GET["fromYear"] . " year", time())))
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_archived', false)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1437,11 +1534,11 @@ Route::get('/get_course_members', function () {
|
|
|
|
|
|
|
|
if ($_GET["toYear"] != "") {
|
|
if ($_GET["toYear"] != "") {
|
|
|
$m_ids = \App\Models\Member::where('birth_date', '>', date("Y-m-d", strtotime("-" . $_GET["toYear"] . " year", time())))
|
|
$m_ids = \App\Models\Member::where('birth_date', '>', date("Y-m-d", strtotime("-" . $_GET["toYear"] . " year", time())))
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_archived', false)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1450,11 +1547,11 @@ Route::get('/get_course_members', function () {
|
|
|
|
|
|
|
|
if ($_GET["fromFromYear"] != "") {
|
|
if ($_GET["fromFromYear"] != "") {
|
|
|
$m_ids = \App\Models\Member::whereYear('birth_date', '>=', $_GET["fromFromYear"])
|
|
$m_ids = \App\Models\Member::whereYear('birth_date', '>=', $_GET["fromFromYear"])
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_archived', false)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1462,11 +1559,11 @@ Route::get('/get_course_members', function () {
|
|
|
}
|
|
}
|
|
|
if ($_GET["toToYear"] != "") {
|
|
if ($_GET["toToYear"] != "") {
|
|
|
$m_ids = \App\Models\Member::whereYear('birth_date', '<=', $_GET["toToYear"])
|
|
$m_ids = \App\Models\Member::whereYear('birth_date', '<=', $_GET["toToYear"])
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_archived', false)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1561,7 +1658,7 @@ Route::get('/get_course_members', function () {
|
|
|
$genderDisplay = "Donna";
|
|
$genderDisplay = "Donna";
|
|
|
} elseif ($r->gender == 'O') {
|
|
} elseif ($r->gender == 'O') {
|
|
|
$genderDisplay = "Altro";
|
|
$genderDisplay = "Altro";
|
|
|
- }elseif ($r->gender == null || $r->gender == "") {
|
|
|
|
|
|
|
+ } elseif ($r->gender == null || $r->gender == "") {
|
|
|
$genderDisplay = "N/A";
|
|
$genderDisplay = "N/A";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1592,14 +1689,14 @@ 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 . "%'");
|
|
|
|
|
- })
|
|
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ $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)
|
|
$query->where('is_archived', false)
|
|
|
->orWhereNull('is_archived');
|
|
->orWhereNull('is_archived');
|
|
|
})
|
|
})
|
|
|
- ->where(function($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('is_deleted', false)
|
|
$query->where('is_deleted', false)
|
|
|
->orWhereNull('is_deleted');
|
|
->orWhereNull('is_deleted');
|
|
|
})->pluck('id');
|
|
})->pluck('id');
|
|
@@ -1623,16 +1720,16 @@ Route::get('/get_receipts', function () {
|
|
|
$receiptIds = $baseQuery->pluck('receipts.id');
|
|
$receiptIds = $baseQuery->pluck('receipts.id');
|
|
|
|
|
|
|
|
$dataQuery = \App\Models\Receipt::select(
|
|
$dataQuery = \App\Models\Receipt::select(
|
|
|
- 'receipts.id',
|
|
|
|
|
- 'receipts.year',
|
|
|
|
|
- 'receipts.number',
|
|
|
|
|
- 'receipts.status',
|
|
|
|
|
- 'receipts.created_at',
|
|
|
|
|
- 'receipts.record_id',
|
|
|
|
|
- 'members.first_name',
|
|
|
|
|
- 'members.last_name',
|
|
|
|
|
- DB::raw('SUM(receipts_rows.amount) AS totals')
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ 'receipts.id',
|
|
|
|
|
+ 'receipts.year',
|
|
|
|
|
+ 'receipts.number',
|
|
|
|
|
+ 'receipts.status',
|
|
|
|
|
+ 'receipts.created_at',
|
|
|
|
|
+ 'receipts.record_id',
|
|
|
|
|
+ 'members.first_name',
|
|
|
|
|
+ 'members.last_name',
|
|
|
|
|
+ DB::raw('SUM(receipts_rows.amount) AS totals')
|
|
|
|
|
+ )
|
|
|
->leftJoin('members', 'receipts.member_id', '=', 'members.id')
|
|
->leftJoin('members', 'receipts.member_id', '=', 'members.id')
|
|
|
->leftJoin('receipts_rows', 'receipts.id', '=', 'receipts_rows.receip_id')
|
|
->leftJoin('receipts_rows', 'receipts.id', '=', 'receipts_rows.receip_id')
|
|
|
->whereIn('receipts.id', $receiptIds)
|
|
->whereIn('receipts.id', $receiptIds)
|
|
@@ -1720,7 +1817,7 @@ function getColor($months, $m)
|
|
|
return $class;
|
|
return $class;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-Route::get('/migrate', function(){
|
|
|
|
|
|
|
+Route::get('/migrate', function () {
|
|
|
Artisan::call('migrate');
|
|
Artisan::call('migrate');
|
|
|
dd('migrated!');
|
|
dd('migrated!');
|
|
|
});
|
|
});
|
|
@@ -1763,8 +1860,7 @@ Route::get('/send_sms', function () {
|
|
|
$certificates = \App\Models\MemberCertificate::where('expire_date', $expire_date)->get();
|
|
$certificates = \App\Models\MemberCertificate::where('expire_date', $expire_date)->get();
|
|
|
foreach ($certificates as $certificate) {
|
|
foreach ($certificates as $certificate) {
|
|
|
$new = \App\Models\MemberCertificate::where('expire_date', '>', $expire_date)->where('member_id', $certificate->member_id)->count();
|
|
$new = \App\Models\MemberCertificate::where('expire_date', '>', $expire_date)->where('member_id', $certificate->member_id)->count();
|
|
|
- if ($new == 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($new == 0) {
|
|
|
$phone = $certificate->member->phone;
|
|
$phone = $certificate->member->phone;
|
|
|
$message = 'Ciao ' . $certificate->member->first_name . ', ci risulta che il tuo certificato medico scade il ' . $expire_date_it . '. Per continuare ad allenarti senza problemi, ricordati di rinnovarlo in tempo. Ti aspettiamo in campo! Centro Sportivo La Madonnella';
|
|
$message = 'Ciao ' . $certificate->member->first_name . ', ci risulta che il tuo certificato medico scade il ' . $expire_date_it . '. Per continuare ad allenarti senza problemi, ricordati di rinnovarlo in tempo. Ti aspettiamo in campo! Centro Sportivo La Madonnella';
|
|
|
$params = array(
|
|
$params = array(
|
|
@@ -1785,8 +1881,7 @@ Route::get('/send_sms', function () {
|
|
|
$certificates = \App\Models\MemberCertificate::where('expire_date', $expire_date)->get();
|
|
$certificates = \App\Models\MemberCertificate::where('expire_date', $expire_date)->get();
|
|
|
foreach ($certificates as $certificate) {
|
|
foreach ($certificates as $certificate) {
|
|
|
$new = \App\Models\MemberCertificate::where('expire_date', '>', $expire_date)->where('member_id', $certificate->member_id)->count();
|
|
$new = \App\Models\MemberCertificate::where('expire_date', '>', $expire_date)->where('member_id', $certificate->member_id)->count();
|
|
|
- if ($new == 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($new == 0) {
|
|
|
$phone = $certificate->member->phone;
|
|
$phone = $certificate->member->phone;
|
|
|
$message = 'Ciao ' . $certificate->member->first_name . ', ci risulta che il tuo certificato medico scade il ' . $expire_date_it . '. Per continuare ad allenarti senza problemi, ricordati di rinnovarlo in tempo. Ti aspettiamo in campo! Centro Sportivo La Madonnella';
|
|
$message = 'Ciao ' . $certificate->member->first_name . ', ci risulta che il tuo certificato medico scade il ' . $expire_date_it . '. Per continuare ad allenarti senza problemi, ricordati di rinnovarlo in tempo. Ti aspettiamo in campo! Centro Sportivo La Madonnella';
|
|
|
$params = array(
|
|
$params = array(
|
|
@@ -1801,31 +1896,24 @@ Route::get('/send_sms', function () {
|
|
|
sleep(1);
|
|
sleep(1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
Route::get('/fix', function () {
|
|
Route::get('/fix', function () {
|
|
|
$datas = \App\Models\MemberCourse::whereNotNull('date_from')->get();
|
|
$datas = \App\Models\MemberCourse::whereNotNull('date_from')->get();
|
|
|
- foreach($datas as $data)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($datas as $data) {
|
|
|
$data->date_from = date("Y-m-d", strtotime($data->created_at));
|
|
$data->date_from = date("Y-m-d", strtotime($data->created_at));
|
|
|
$date_to = '';
|
|
$date_to = '';
|
|
|
$months = json_decode($data->months);
|
|
$months = json_decode($data->months);
|
|
|
- foreach($months as $m)
|
|
|
|
|
- {
|
|
|
|
|
- if ($m->m >= 9)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($months as $m) {
|
|
|
|
|
+ if ($m->m >= 9) {
|
|
|
$check = "2025-" . $m->m . "-01";
|
|
$check = "2025-" . $m->m . "-01";
|
|
|
$date_to = date("Y-m-t", strtotime($check));
|
|
$date_to = date("Y-m-t", strtotime($check));
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ } else {
|
|
|
$check = "2026-" . $m->m . "-01";
|
|
$check = "2026-" . $m->m . "-01";
|
|
|
$date_to = date("Y-m-t", strtotime($check));
|
|
$date_to = date("Y-m-t", strtotime($check));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
$data->date_to = $date_to;
|
|
$data->date_to = $date_to;
|
|
|
$data->save();
|
|
$data->save();
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
-});
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+});
|