added company pro to transactions

app/Http/Controllers/pros_SINGLE_Controller.php

@@ -3,6 +3,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\CompanyPro;
 use App\Models\Pro;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -669,8 +670,14 @@ class pros_SINGLE_Controller extends Controller
 		}
 		$subRecords = DB::table('pro_transaction')->where('pro_id', $record->id)->get();
 		$result_clients = DB::select("select id, concat(name_last, ', ', name_first) as name_display from client");
+	
+		$companyPros = [];
+		foreach($subRecords as $subRecord){
+			$companyPros[$subRecord->company_pro_id] = CompanyPro::find($subRecord->company_pro_id);
+		}
+
 		$result_pros = DB::select("select id, concat(name_last, ', ', name_first) as name_display from pro");
-		return response()->view('admin/pros_SINGLE/SUB_transactions', compact('record', 'subRecords', 'result_clients', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('admin/pros_SINGLE/SUB_transactions', compact('record', 'subRecords', 'companyPros','result_clients', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_sessions

resources/views/admin/pros_SINGLE/SUB_transactions.blade.php

@@ -1,3 +1,5 @@
+<?php /* DO NOT GENERATE */ ?>
+
 @extends('admin.pros.view')
 @section('content-inner')
 
@@ -13,28 +15,30 @@
         <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
             <table class="table table-hover text-nowrap">
                 <thead>
-                <tr>
-                    <th>&nbsp;</th>
-<th>Created At</th>
-<th>Pro</th>
-<th>Client</th>
-<th>Plus Or Minus</th>
-<th>Reason Type</th>
-<th>Amount</th>
-<th>Resulting Balance</th>
-                </tr>
+                    <tr>
+                        <th>&nbsp;</th>
+                        <th>Created At</th>
+                        <th>Pro</th>
+                        <th>Company</th>
+                        <th>Client</th>
+                        <th>Plus Or Minus</th>
+                        <th>Reason Type</th>
+                        <th>Amount</th>
+                        <th>Resulting Balance</th>
+                    </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/transactions/view/{{ $subRecord->uid }}/SUB_dashboard"><i class="fas fa-share-square"></i></a></td>
-<td><a href="/transactions/view/{{ $subRecord->uid }}/SUB_dashboard"><?= friendly_date_time($subRecord->created_at) ?></a></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_clients, 'name_display', [['id', '=', $subRecord->client_id], ], 'all'); ?></td>
-<td><?= $subRecord->plus_or_minus ?></td>
-<td><?= $subRecord->reason_type ?></td>
-<td><?= $subRecord->amount ?></td>
-<td><?= $subRecord->resulting_balance ?></td>
+                        <td><a href="/transactions/view/{{ $subRecord->uid }}/SUB_dashboard"><?= friendly_date_time($subRecord->created_at) ?></a></td>
+                        <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->pro_id], ], 'all'); ?></td>
+                        <td>{{isset($companyPros[$subRecord->company_pro_id])?$companyPros[$subRecord->company_pro_id]->company->name:'-'}}</td>
+                        <td><?= value_from_rs($result_clients, 'name_display', [['id', '=', $subRecord->client_id], ], 'all'); ?></td>
+                        <td><?= $subRecord->plus_or_minus ?></td>
+                        <td><?= $subRecord->reason_type ?></td>
+                        <td><?= $subRecord->amount ?></td>
+                        <td><?= $subRecord->resulting_balance ?></td>
                     </tr>
                 @endforeach
                 </tbody>