diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index 5835615f32bc..775414d0633d 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -47,7 +47,6 @@ return array( 'subtotal' => 'Subtotal', 'paid_to_date' => 'Paid to Date', 'balance_due' => 'Balance Due', - 'balance' => 'Balance', 'invoice_design_id' => 'Design', 'terms' => 'Terms', 'your_invoice' => 'Your Invoice', @@ -89,8 +88,6 @@ return array( 'company_details' => 'Company Details', 'online_payments' => 'Online Payments', 'notifications' => 'Notifications', - 'alert'=>'ALERT', - 'view_all' =>'VIEW ALL', 'import_export' => 'Import/Export', 'done' => 'Done', 'save' => 'Save', @@ -121,11 +118,9 @@ return array( 'billed_clients' => 'billed clients', 'active_client' => 'active client', 'active_clients' => 'active clients', - 'invoices_past_due' => 'PAST DUE INVOICES', - 'upcoming_invoices' => 'UPCOMING INVOICES', - 'average_invoice' => 'Invoice Average', - 'total_active_client'=> 'Total Active Clients', - + 'invoices_past_due' => 'Invoices Past Due', + 'upcoming_invoices' => 'Upcoming invoices', + 'average_invoice' => 'Average invoice', // list pages 'archive' => 'Archive', diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index de05cffef170..cb8802f27f66 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -1,20 +1,5 @@ @extends('header') - - - - - - - - @section('content')
{{ trans('texts.client') }} | -{{ trans('texts.invoice_number_short') }} | -{{ trans('texts.balance') }} | -{{ trans('texts.due_date') }} | - -
---|
{{ $invoice->client->getDisplayName() }} | -{{ $invoice->getLink() }} | -{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }} | -{{ Utils::fromSqlDate($invoice->due_date) }} | -{{ trans('texts.invoice_number_short') }} | +{{ trans('texts.client') }} | +{{ trans('texts.due_date') }} | +{{ trans('texts.balance_due') }} | + + + @foreach ($pastDue as $invoice) +
---|---|---|---|
{{ $invoice->getLink() }} | +{{ $invoice->client->getDisplayName() }} | +{{ Utils::fromSqlDate($invoice->due_date) }} | +{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }} | +
- -
- -
{{ trans('texts.client') }} | -{{ trans('texts.invoice_number_short') }} | -{{ trans('texts.balance') }} | -{{ trans('texts.due_date') }} | - -
---|
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
ads | -sdfds | -sdf | -sdfs | -
{{ $invoice->client->getDisplayName() }} | -{{ $invoice->getLink() }} | -{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }} | -{{ Utils::fromSqlDate($invoice->due_date) }} | -{{ trans('texts.invoice_number_short') }} | +{{ trans('texts.client') }} | +{{ trans('texts.due_date') }} | +{{ trans('texts.balance_due') }} | + + + @foreach ($upcoming as $invoice) +
---|---|---|---|
{{ $invoice->getLink() }} | +{{ $invoice->client->getDisplayName() }} | +{{ Utils::fromSqlDate($invoice->due_date) }} | +{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }} | +
{{ trans('texts.total_active_client') }}
{{ trans('texts.average_invoice') }}