FabioFratini пре 9 месеци
родитељ
комит
fde295cd6e
1 измењених фајлова са 14 додато и 5 уклоњено
  1. 14 5
      routes/web.php

+ 14 - 5
routes/web.php

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
 
 /*
 |--------------------------------------------------------------------------
@@ -1435,11 +1436,19 @@ Route::get('/get_course_members', function () {
 });
 
 Route::get('/get_receipts', function () {
-    $x = \App\Models\Receipt::select('receipts.*', 'members.first_name', 'members.last_name', DB::raw('SUM(receipts_rows.amount) AS totals'))
-        ->leftJoin('members', 'receipts.member_id', '=', 'members.id')
-        ->leftJoin('receipts_rows', 'receipts.id', '=', 'receipts_rows.receip_id')
-        ->groupBy('receipts.id', 'receipts.record_id', 'receipts.member_id', 'members.first_name', 'members.last_name');
-
+        $receiptColumns = Schema::getColumnListing('receipts');
+        $groupByColumns = array_map(function($column) {
+            return 'receipts.' . $column;
+        }, $receiptColumns);
+
+        // Add member columns
+        $groupByColumns[] = 'members.first_name';
+        $groupByColumns[] = 'members.last_name';
+
+        $x = \App\Models\Receipt::select('receipts.*', 'members.first_name', 'members.last_name', DB::raw('SUM(receipts_rows.amount) AS totals'))
+            ->leftJoin('members', 'receipts.member_id', '=', 'members.id')
+            ->leftJoin('receipts_rows', 'receipts.id', '=', 'receipts_rows.receip_id')
+            ->groupBy($groupByColumns);
     if (isset($_GET["search"]["value"])) {
         $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
         $member_ids = \App\Models\Member::where(function ($query) use ($v) {