|
|
@@ -2,6 +2,10 @@
|
|
|
|
|
|
use Illuminate\Support\Facades\Route;
|
|
|
use Barryvdh\DomPDF\Facade\Pdf;
|
|
|
+use Illuminate\Support\Facades\Redirect;
|
|
|
+use Illuminate\Support\Facades\Auth;
|
|
|
+use Illuminate\Support\Facades\DB;
|
|
|
+use Illuminate\Support\Facades\Artisan;
|
|
|
|
|
|
/*
|
|
|
|--------------------------------------------------------------------------
|
|
|
@@ -408,13 +412,13 @@ Route::group(['middleware' => 'auth'],function(){
|
|
|
|
|
|
$datas = [];
|
|
|
|
|
|
- $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'))
|
|
|
+ $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.amount', 'records.member_id', 'records.corrispettivo_fiscale', 'records.deleted', 'records.financial_movement', 'records_rows.causal_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.amount', 'records.member_id', 'records.corrispettivo_fiscale', 'records.deleted', 'records.financial_movement', 'records_rows.causal_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('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
//->leftJoin('receipts', 'records.id', '=', 'receipts.record_id')
|
|
|
@@ -1557,7 +1561,7 @@ function getColor($months, $m)
|
|
|
}
|
|
|
|
|
|
Route::get('/migrate', function(){
|
|
|
- \Artisan::call('migrate');
|
|
|
+ Artisan::call('migrate');
|
|
|
dd('migrated!');
|
|
|
});
|
|
|
|