shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #140

Browse Source
This commit is contained in:
denisdulici
2017-12-11 11:01:44 +03:00
parent 9d7ace396c
commit 962ac5cff9
5 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Customers/Dashboard.php
View File

@ -3,8 +3,7 @@
namespace App\Http\Controllers\Customers;
use App\Http\Controllers\Controller;
use Auth;
use App\Models\Income\Invoice;
class Dashboard extends Controller
{
@ -16,8 +15,10 @@ class Dashboard extends Controller
*/
public function index()
{
$user = Auth::user()->customer;
$customer = auth()->user()->customer;
return view('customers.dashboard.index', compact('user'));
$invoices = Invoice::with('status')->accrued()->where('customer_id', $customer->id)->get();
return view('customers.dashboard.index', compact('customer', 'invoices'));
}
}

20
app/Http/Controllers/Customers/Invoices.php
View File

@ -12,8 +12,6 @@ use App\Models\Setting\Currency;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Uploads;
use Auth;
use App\Utilities\Modules;
class Invoices extends Controller
@ -27,19 +25,7 @@ class Invoices extends Controller
*/
public function index()
{
$invoices = Invoice::with('status')->where('customer_id', '=', Auth::user()->customer->id)->paginate();
foreach ($invoices as $invoice) {
$paid = 0;
foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code;
$paid += $item->getDynamicConvertedAmount();
}
$invoice->amount = $invoice->amount - $paid;
}
$invoices = Invoice::with('status')->accrued()->where('customer_id', auth()->user()->customer->id)->paginate();
$status = collect(InvoiceStatus::all()->pluck('name', 'code'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
@ -94,7 +80,7 @@ class Invoices extends Controller
/**
* Show the form for viewing the specified resource.
*
* @param int $invoice_id
* @param Invoice $invoice
*
* @return Response
*/
@ -126,7 +112,7 @@ class Invoices extends Controller
/**
* Show the form for viewing the specified resource.
*
* @param int $invoice_id
* @param Invoice $invoice
*
* @return Response
*/