drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

srp stuff

Browse Source
This commit is contained in:
drkthunder02
2019-08-04 02:19:52 -05:00
parent 7f02874923
commit 9099997b2c
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Library/Taxes/TaxesHelper.php
View File

@@ -143,9 +143,11 @@ class TaxesHelper {
public function GetOfficeGross($start, $end) {
$revenue = 0.00;
$revenue = OfficeFeesJournal::where(['ref_type' => 'office_rental_fee', 'second_party_id' => '98287666'])
->whereBetween('date', [$start, $end])
->sum('amount');
$revenue = OfficeFeesJournal::where([
'ref_type' => 'office_rental_fee',
'second_party_id' => '98287666',
])->whereBetween('date', [$start, $end])
->sum('amount');
return $revenue;
}

12
resources/views/admin/dashboard.blade.php
View File

@@ -311,10 +311,10 @@
<th>SRP Actual</th>
</thead>
<tbody>
@foreach($srpActual as $srp)
@foreach($srpActual as $actual)
<tr>
<td>{{ $srp['date'] }}</td>
<td>{{ $srp['gross'] }}</td>
<td>{{ $actual['date'] }}</td>
<td>{{ $actual['gross'] }}</td>
</tr>
@endforeach
</tbody>
@@ -334,10 +334,10 @@
<th>SRP Loss</th>
</thead>
<tbody>
@foreach($srpLoss as $srp)
@foreach($srpLoss as $loss)
<tr>
<td>{{ $srp['date'] }}</td>
<td>{{ $srp['gross'] }}</td>
<td>{{ $loss['date'] }}</td>
<td>{{ $loss['gross'] }}</td>
</tr>
@endforeach
</tbody>