diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index afe57e561f..861a3d0acb 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -120,6 +120,10 @@ return array( 'billed_client' => 'billed client', 'billed_clients' => 'billed clients', 'active_client' => 'active client', + 'total_outstading' => 'Total Outstading', + 'caps_invoice' => 'INVOICE', + 'accounts_aging' => 'ACCOUNTS AGING', + 'account_dashboard' => 'Account Dashboard', 'active_clients' => 'active clients', 'invoices_past_due' => 'PAST DUE INVOICES', 'upcoming_invoices' => 'UPCOMING INVOICES', diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index de05cffef1..1b99d01e99 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -10,53 +10,84 @@ function() { $("#informationBox").niceScroll(); //$("#upComingDataScrolls").niceScroll(); + + $("#monthButton").onclick(function(){ + $("#monthButton").removeClass('greyButton').addClass('blueButton'); + $("#yearButton").removeClass('blueButton').addClass('greyButton'); + $("#weekButton").removeClass('blueButton').addClass('greyButton'); + }); + + $("#yearButton").onclick(function(){ + $("#monthButton").removeClass('blueButton').addClass('greyButton'); + $("#yearButton").removeClass('greyButton').addClass('blueButton'); + $("#weekButton").removeClass('blueButton').addClass('greyButton'); + }); + + $("#weekButton").onclick(function(){ + $("#monthButton").removeClass('blueButton').addClass('greyButton'); + $("#yearButton").removeClass('blueButton').addClass('greyButton'); + $("#weekButton").removeClass('greyButton').addClass('blueButton'); + }); + }); - +
+
+
+ + {{ trans('texts.account_dashboard') }} +
+
+ +
+
+
@section('content') -
-
-
-
- -
- {{ $totalIncome }} -
-
- {{ trans('texts.in_total_revenue') }} -
-
-
-
-
-
-
- -
- {{ $billedClients }} -
-
- {{ Utils::pluralize('billed_client', $billedClients) }} -
-
-
-
-
-
-
- -
- {{ $invoicesSent }} -
-
- {{ Utils::pluralize('invoice', $invoicesSent) }} {{ trans('texts.sent') }} -
-
-
-
+
+
+
+
+ +
{{ trans('texts.total_outstading') }}
+
{{ trans('texts.caps_invoice') }}
+ +
{{ $totalIncome }}
+
Across all clients
+
+
+
+
+
+ {{trans('texts.accounts_aging')}} + +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
@@ -172,60 +203,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @foreach ($pastDue as $invoice) @@ -244,20 +221,22 @@
-

{{ trans('texts.total_active_client') }}

-
{{ $activeClients }}
- +

{{ trans('texts.total_active_client') }}

+
{{ $activeClients }}
- +
-

{{ trans('texts.average_invoice') }}

-
{{ $invoiceAvg }}
+

{{ trans('texts.average_invoice') }}

+
{{ $invoiceAvg }}
+
Across all clients
+
+ Month + Year + Week +
diff --git a/public/css/customCss.css b/public/css/customCss.css index 083625fd04..b8ee9d02cb 100644 --- a/public/css/customCss.css +++ b/public/css/customCss.css @@ -116,3 +116,24 @@ width: 25%; } +.blueButton{ + background-image: url('../images/blue_bg_img.png'); + background-repeat: no-repeat; + background-size: 100%; + width: 33%; + float: left; + font-weight: bold; + padding: 2.6%; + color: white; +} + +.greyButton{ + background-image: url('../images/gray_bg_img.png'); + background-repeat: no-repeat; + background-size: 100%; + width: 32%; + float: left; + font-weight: bold; + padding: 2%; + margin-top: 1%; +} diff --git a/public/images/blue_bg_img.png b/public/images/blue_bg_img.png new file mode 100644 index 0000000000..019d849265 Binary files /dev/null and b/public/images/blue_bg_img.png differ diff --git a/public/images/company_bg_img.png b/public/images/company_bg_img.png new file mode 100644 index 0000000000..b52e3332f0 Binary files /dev/null and b/public/images/company_bg_img.png differ diff --git a/public/images/gray_bg_img.png b/public/images/gray_bg_img.png new file mode 100644 index 0000000000..de6f941b6d Binary files /dev/null and b/public/images/gray_bg_img.png differ diff --git a/public/images/ring-blue.png b/public/images/ring-blue.png new file mode 100644 index 0000000000..531ec0e797 Binary files /dev/null and b/public/images/ring-blue.png differ diff --git a/public/images/ring-green.png b/public/images/ring-green.png new file mode 100644 index 0000000000..15906d459a Binary files /dev/null and b/public/images/ring-green.png differ diff --git a/public/images/ring-orange.png b/public/images/ring-orange.png new file mode 100644 index 0000000000..96704c9afc Binary files /dev/null and b/public/images/ring-orange.png differ
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
adssdfdssdfsdfs
{{ $invoice->client->getDisplayName() }}