Merge branch 'master' of http://host.webmagistri.biz:3000/parisio/iao_team

app/Http/Livewire/Record.php

@@ -316,8 +316,14 @@ class Record extends Component
         $idx = 0;
         foreach($this->payments as $p)
         {
+            if ($idx >= count($letters)) {
+                break;
+            }
             $activeWorksheet->setCellValue($letters[$idx] . '1', $p->name);
             $idx++;
+            if ($idx >= count($letters)) {
+                break;
+            }
             $activeWorksheet->mergeCells($letters[$idx] . '1:' . $letters[$idx] . '1');
             $idx++;
         }
@@ -330,18 +336,30 @@ class Record extends Component
         foreach($this->payments as $p)
         {
             if($p->type == 'ALL'){
+                if ($idx >= count($letters)) {
+                    break;
+                }
+
                 $activeWorksheet->setCellValue($letters[$idx] . '2', "Entrate");
                 $idx++;
                 $activeWorksheet->setCellValue($letters[$idx] . '2', "Uscite");
                 $idx++;
             }
             elseif($p->type == 'IN'){
+                if ($idx >= count($letters)) {
+                    break;
+                }
+
                 $activeWorksheet->setCellValue($letters[$idx] . '2', "Entrate");
                 $idx++;
                 $activeWorksheet->setCellValue($letters[$idx] . '2', "");
                 $idx++;
             }
             elseif($p->type == 'OUT'){
+                if ($idx >= count($letters)) {
+                    break;
+                }
+
                 $activeWorksheet->setCellValue($letters[$idx] . '2', "");
                 $idx++;
                 $activeWorksheet->setCellValue($letters[$idx] . '2', "Uscite");
@@ -396,6 +414,10 @@ class Record extends Component
                 }
                 else
                 {
+                    if ($idx >= count($letters)) {
+                        break;
+                    }
+
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "");
                     $idx++;
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "");
@@ -441,18 +463,30 @@ class Record extends Component
             else
             {
                 if($p->type == 'ALL'){
+                    if ($idx >= count($letters)) {
+                        break;
+                    }
+
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "0");
                     $idx++;
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "0");
                     $idx++;
                 }
                 elseif($p->type == 'IN'){
+                    if ($idx >= count($letters)) {
+                        break;
+                    }
+
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "0");
                     $idx++;
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "");
                     $idx++;
                 }
                 elseif($p->type == 'OUT'){
+                    if ($idx >= count($letters)) {
+                        break;
+                    }
+
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "");
                     $idx++;
                     $activeWorksheet->setCellValue($letters[$idx] . $count, "0");

app/Http/Livewire/Reports.php

@@ -226,6 +226,7 @@ class Reports extends Component
             ->orderBy('name')
             ->get()
             ->map(function ($course) {
+                $type = null;
                 if (!empty($course->course_type_id)) {
                     $type = \App\Models\CourseType::find($course->course_type_id);
                     if ($type) {

app/Http/Middleware/TrustProxies.php

@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array<int, string>|string|null
      */
-    protected $proxies;
+    protected $proxies ='*';
 
     /**
      * The headers that should be used to detect proxies.

app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\URL;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+            URL::forceScheme('https');
     }
 }

routes/web.php

@@ -6,6 +6,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;
 
 /*
 |--------------------------------------------------------------------------
@@ -1448,11 +1449,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', '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) {