diff --git a/app/Library/Taxes/TaxesHelper.php b/app/Library/Taxes/TaxesHelper.php index 97cf7d4a9..1197f4eb3 100644 --- a/app/Library/Taxes/TaxesHelper.php +++ b/app/Library/Taxes/TaxesHelper.php @@ -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; } diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 56f627a19..37665320c 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -311,10 +311,10 @@ SRP Actual - @foreach($srpActual as $srp) + @foreach($srpActual as $actual) - {{ $srp['date'] }} - {{ $srp['gross'] }} + {{ $actual['date'] }} + {{ $actual['gross'] }} @endforeach @@ -334,10 +334,10 @@ SRP Loss - @foreach($srpLoss as $srp) + @foreach($srpLoss as $loss) - {{ $srp['date'] }} - {{ $srp['gross'] }} + {{ $loss['date'] }} + {{ $loss['gross'] }} @endforeach